diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-11-30 11:48:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 11:48:21 -0800 |
| commit | 3bb84c0cb70a7808a35313e94c49604fd5cccb43 (patch) | |
| tree | 2c7c7d491a3baf34446824d029b838ba7f76a3cb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 37dcb4c955b9a670da96fa4731f7db9e92f0388d (diff) | |
| parent | a36b003bdc99da827d9c56cd627c9f12a8f9274a (diff) | |
am 827eed06: am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1
* commit '827eed06cd60edf6bb873c7603ec3150b2ba8157':
Avoid airplane mode labels when Wi-Fi enabled.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions