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 | 28147b654bba8ae2b7976e58aa7869255e436b0b (patch) | |
| tree | df2bb0c56241d40a795d055cf7b7b7ca96f91365 /opengl/java/android/opengl/Texture.java | |
| parent | ddd51fdb7117a6a0812968a47b43067d3d899991 (diff) | |
| parent | 827eed06cd60edf6bb873c7603ec3150b2ba8157 (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/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions