diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-16 13:11:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-16 13:11:27 -0700 |
| commit | ec2c9751d802853ac1e9898cbcebf47efe7668d8 (patch) | |
| tree | 5797ce3709bc320265cc9813cbf915f88d9c70d1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cbf3ce51c892a6de9a6fb66d6c81004c3a9ddb7e (diff) | |
| parent | 2737840be4643afc2d7cdd7304a00aaf6cd0af7e (diff) | |
am 63446167: (-s ours) am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
* commit '63446167b9d6d9ed3410320d17e8fe816caf6c42':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions