summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-13 16:26:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-13 16:26:44 -0700
commite50994f021552a2f56e2758e3de685f79be5ccfd (patch)
tree1f465c937ea4ed997c1a9048c3d9c9fe3bf79276 /opengl/tests/gl_basic/gl_basic.cpp
parentd26eaf683d3a6c12027f9a001e200b3ccd137bc3 (diff)
parentbd2fecd92727cfa54c855bed5f360c43600d1b24 (diff)
am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
* commit '6121f06ed5847d1edd22b23c3b28bf3b3e3af602': Fix a bug where an action bar could be created when it should not be.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions