diff options
| author | Tom Taylor <tomtaylor@google.com> | 2011-11-09 14:34:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-09 14:34:18 +0000 |
| commit | 52920840e2924c8ce3aebf5982f5a64b96d16865 (patch) | |
| tree | 6191b555f84848c224a8aaca7664edba7eb10ded /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 422532eb3f92193a7441deb36db047d9c7515167 (diff) | |
| parent | ad5385f1f07dabc21ffb114547e454fbfd5002ed (diff) | |
am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
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