diff options
author | Jeff Sharkey <jsharkey@android.com> | 2011-11-30 11:46:19 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 11:46:19 -0800 |
commit | a36b003bdc99da827d9c56cd627c9f12a8f9274a (patch) | |
tree | 3d859fbffa0ef9495df1d244ac32b9e044b43105 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 5a1696368c8013297d24226abb1f174e9ca92c39 (diff) | |
parent | 4f1fbce904a51a84aded8efc5f2c7727c9f6d35e (diff) |
am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1
* commit '47e4015ba23c507196980dcb4a311afc7e2358b1':
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