diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-05-24 12:57:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 12:57:08 -0700 |
| commit | 53b228eb5e37cd7098e23f4e228bd73b7c62dafb (patch) | |
| tree | fa7e08be79acf374c2b1528c101429d31ff3206f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f38b2edd3ef55ce2737d963d000d84a968140a25 (diff) | |
| parent | 1ec44accb63af5fabea875b98f996593c437c38f (diff) | |
am fcdbcf91: (-s ours) am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
* commit 'fcdbcf9174f7a5404da4514b71041c3d37692d15':
DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
