diff options
| author | Adam Powell <adamp@google.com> | 2011-06-02 10:42:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-02 10:42:12 -0700 |
| commit | 32e15ba3c8d2b75141631ca3db3b6a985efe4ab3 (patch) | |
| tree | d22b6e74ceca0cc372ef3956198779d7b63c9b46 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 79d500aa5cd4456a89217c30e8d35ba44b69b0ab (diff) | |
| parent | b5f372d3afc385c306dd08104de40165c074170a (diff) | |
am d31320d5: (-s ours) 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 'd31320d58fa3597962ed47d131aef6340beee4fa':
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