summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-02-23 13:04:24 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-23 13:04:24 -0800
commit064da449c4b008f8bb7edec9a97942e8afd6f966 (patch)
tree017d9ec7a4202769f80c494affbbeeffc505a8d7 /opengl/tests/gl_basic/gl_basic.cpp
parentae31099c8a2aa21b1995f757c57adeb8de6d0de0 (diff)
parent32776d72220313d72cc47d49e9f52c6be12b2d33 (diff)
am 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '0842a2262d03fc98e42541cb38f51a341d346ae0': Fix for issue 9656 - custom xml attributes in Android Libraries
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions