diff options
| author | Tom Taylor <tomtaylor@google.com> | 2011-11-10 21:16:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 21:16:54 +0000 |
| commit | fb894276b127767e610fc99cc4539c397c4e7ecc (patch) | |
| tree | 6e52fa6e6ee5995360198bacfa5e320f0c51579d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | dce3af33a53c15f5fe290b0de4e126eb5b2d883f (diff) | |
| parent | 0bbd151e1dab043226725d23f0ca26f4d09ee76f (diff) | |
am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1
* commit '0bbd151e1dab043226725d23f0ca26f4d09ee76f':
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