am 47f31b19: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit '47f31b19811a177baa1ae868282374970295caeb':
  Find non-extension GLES wrappers in eglGetProcAddress

...

This commit is contained in:

The Android Open Source Project 2013-07-11 10:17:06 -07:00 committed by Android Git Automerger

parent 7b4d5355fb 47f31b1981

commit ffc791a9de

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available