diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-04-04 17:44:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-04 17:44:38 -0700 |
| commit | 8757f75762e684f2b8aedf93520e4bc457ee429e (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5baaac6fbb4f2c6485a9d0a415daab0a1ee85712 (diff) | |
| parent | 42a45d036e5c0db71db72074537236db0f3aabb3 (diff) | |
am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
* commit 'd7a8e8453d8302ac9820af49b4b112468efdf36d':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions