diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2013-07-16 15:36:08 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-16 15:36:08 -0700 |
commit | 0e615634de25c7d29f9fcbab907a4d120d8b83e2 (patch) | |
tree | 171f3bfd39eeb9b48ca845bcccb8db7e73809c88 /opengl/libs/EGL/eglApi.cpp | |
parent | bce7611e8e4514026bf12f96baaf9168f6d5894e (diff) | |
parent | 384f55fff01a9d0630b801abd016b82ded4c5984 (diff) | |
download | frameworks_native-0e615634de25c7d29f9fcbab907a4d120d8b83e2.zip frameworks_native-0e615634de25c7d29f9fcbab907a4d120d8b83e2.tar.gz frameworks_native-0e615634de25c7d29f9fcbab907a4d120d8b83e2.tar.bz2 |
am 384f55ff: (-s ours) Merge "Tweaks for forward compatibility" into stage-aosp-master
* commit '384f55fff01a9d0630b801abd016b82ded4c5984':
Tweaks for forward compatibility
Diffstat (limited to 'opengl/libs/EGL/eglApi.cpp')
0 files changed, 0 insertions, 0 deletions