diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-03-14 13:34:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 13:34:18 -0700 |
| commit | ab42c6e9bd52fd56996a0f1a16bb1dcb176036d0 (patch) | |
| tree | 3df13b324209e6ab022e8508522255c975507533 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1d54dc2d85abe78a6d084e46bf5ae5af73c2430b (diff) | |
| parent | 82333c550ef4e2098ccb1143c0703deb6c49082d (diff) | |
am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
* commit 'ee3f6ef2fc7bcfae9d8af8430760388f653a10c8':
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