diff options
author | Andy McFadden <fadden@android.com> | 2012-11-27 11:39:20 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-27 11:39:20 -0800 |
commit | db2e4f16bb1c804414773862030cdb0aa5413778 (patch) | |
tree | 461d8a8eb4e3bae569205bbd34ff278afa72ae78 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 0e34af6284c258c1dc56670a573ef11a76dda9fe (diff) | |
parent | a90173d86dd209aee55d833c73c424d854a98c70 (diff) |
am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit 'a90173d86dd209aee55d833c73c424d854a98c70':
DO NOT MERGE - native_fence_sync: fix an enum name
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions