summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-09-27 14:32:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-27 14:32:06 -0700
commit10082c6cad2f691281468845a102a615026e8628 (patch)
treef1f0e7831502036b3e854a76778f8c6ae8d6def6 /opengl/tests/gl_basic/gl_basic.cpp
parentf842cbb8e8391167d7a5b95f0f41d397e3b07680 (diff)
parent4b21b139867c815af563a07874e0c218d61458c0 (diff)
am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Merge commit '0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp * commit '0ba5b647842ab71f4b1a3080ca113eb646371d91': Revert previous status bar assets. DO NOT MERGE.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions