diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-16 13:18:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-16 13:18:54 -0700 |
| commit | 54a26180adf6700db14cf35080313e75ae1037ec (patch) | |
| tree | 5797ce3709bc320265cc9813cbf915f88d9c70d1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ec2c9751d802853ac1e9898cbcebf47efe7668d8 (diff) | |
| parent | d3cf1ea694aa302804687b50aa8ce6306903382a (diff) | |
am 60e13114: (-s ours) am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '60e13114eb806d50b7b362d39051c5c775704bf6':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions