diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-03-14 18:27:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 18:27:28 -0700 |
| commit | 0b8edc958255f815bfa0205161d754bc6c2c7ae2 (patch) | |
| tree | 10bbdf4e30a7754b144a7bff01e3266f57ea3cdb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4c8ef27c017d26c31257d25bb2f6135193070873 (diff) | |
| parent | 321e4c9c8fa32b814d59e81fec2c7f07b4861928 (diff) | |
am 321e4c9c: (-s ours) am 81e1ed7e: (-s ours) am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
* commit '321e4c9c8fa32b814d59e81fec2c7f07b4861928':
DO NOT MERGE Support WiMAX Settings & ticker message
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions