summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-09-22 22:07:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-22 22:07:40 -0700
commit24a47fb302d4a624ca7df017571d4ecc54d19851 (patch)
tree653b565a6456c6bc28c77296b7401614aaf2fc2e /opengl/tests/gl_basic/gl_basic.cpp
parent65bde7458c2adeceb3b6cf3e6c9d3d760652ac2b (diff)
parent73a41636a2ef8c9993f82a15a4565dc42433aec4 (diff)
am 37e3f49f: (-s ours) am e8189420: Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread
Merge commit '37e3f49fb4b5ac23a985ab12b7951523be54b688' * commit '37e3f49fb4b5ac23a985ab12b7951523be54b688': DO NOT MERGE Apply new styles to the status bar/notification shade
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions