OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b4d535 47f31b1)
am 47f31b19: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Jul 2013 17:17:06 +0000 (10:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jul 2013 17:17:06 +0000 (10:17 -0700)
* commit '47f31b19811a177baa1ae868282374970295caeb':
  Find non-extension GLES wrappers in eglGetProcAddress


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help