diff options
| author | Tom Taylor <tomtaylor@google.com> | 2011-11-10 21:13:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 21:13:42 +0000 |
| commit | 0bbd151e1dab043226725d23f0ca26f4d09ee76f (patch) | |
| tree | 571bf2ce8ffd60bfc554da21dbf570978e705d04 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 22c2d1d6ae48c348f4c331361a6e3f2c63b2aa8f (diff) | |
| parent | faa81c82103e89a3f2c86c4e737d9beb7e557402 (diff) | |
am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1
* commit 'faa81c82103e89a3f2c86c4e737d9beb7e557402':
Revert "Add new secure setting for controlling Messaging notifications"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions