summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-05-26 14:14:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-26 14:14:50 -0700
commitb5f372d3afc385c306dd08104de40165c074170a (patch)
tree2ee963463c3506b8788200904160b078e5e5a51d /opengl/tests/gl_basic/gl_basic.cpp
parent98f3ba4d0e2a0f6659061f39c8f93c76cf1fd821 (diff)
parent463df4f97f1fd398e1e632b36a58ff6b3880f301 (diff)
am 47dae694: am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
* commit '47dae694d7476e8a3de1e9b487b89e003b8440b1': DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions