diff options
author | Tom Taylor <tomtaylor@google.com> | 2011-11-10 13:11:16 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-10 13:11:16 -0800 |
commit | faa81c82103e89a3f2c86c4e737d9beb7e557402 (patch) | |
tree | 571bf2ce8ffd60bfc554da21dbf570978e705d04 /opengl/java/android/opengl/Texture.java | |
parent | c1c5d4faa22a7d22b8225b2bbf83206698b83763 (diff) | |
parent | 994da2ad3242407fd822e6b35e3d302a3667d9c3 (diff) |
Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions