summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-05-19 08:58:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-19 08:58:42 -0700
commit02aad4811a3390d4a5f509cda41dc421a0f24447 (patch)
treea682011d320462a7c841ea4260b587dd21a01d57 /opengl/tests/gl_basic/gl_basic.cpp
parent85f059a82dadfd8aee3476c409765bff5672cd1f (diff)
parent62de6cdcb898bbc9d934166ee0fe31136057cb92 (diff)
am c8f045b8: (-s ours) am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
* commit 'c8f045b8a4cc83bc40ee999cb03a446f986d445c': DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions