diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-09 11:23:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 11:23:10 -0700 |
| commit | 9c9cea7bf0c24e8025187d46fa06eaf234bf3de8 (patch) | |
| tree | 713706e3b687bb494c536ef68d1314634302de9f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 52e2db4061cdf4e44f1f46f0a356d3dd7926b162 (diff) | |
| parent | 5252ccec49405501c6f924b97a121f3eb2b9e9d2 (diff) | |
am 891266e3: (-s ours) am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
* commit '891266e36e230fa0a4f4466672834a8e3e97598e':
DO NOT MERGE. Experimental compatibility mode UI.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions