| commit | ffc791a9de44621b1dccaa8e1a987cdbca28a289 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 10:17:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 10:17:06 2013 -0700 |
| tree | b803d0b56902cc80ca152c3b1311e9af0162e0e0 | |
| parent | 7b4d5355fb4c937de1c0a2b959514fbd971553d7 [diff] | |
| parent | 47f31b19811a177baa1ae868282374970295caeb [diff] |
am 47f31b19: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '47f31b19811a177baa1ae868282374970295caeb': Find non-extension GLES wrappers in eglGetProcAddress