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 | 827eed06cd60edf6bb873c7603ec3150b2ba8157 (patch) | |
| tree | 8cc3cff30c39f97928fd444487808bbd3cfd85d0 /opengl/java/android/opengl/Texture.java | |
| parent | 4661a05bef8c98b18698202c758067ac9c965f77 (diff) | |
| parent | 47e4015ba23c507196980dcb4a311afc7e2358b1 (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/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions