diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-11-09 16:59:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-09 16:59:48 +0000 |
| commit | 036da41922c936d25b36fbc4b5927a0097ece330 (patch) | |
| tree | 0cc1d5f8b243996d94080ceec6b229f68275e6b3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6e82e95c08bd1e2c46837e9ddb8759e5ca977f84 (diff) | |
| parent | 20cf0916cc6a4920b1d882a9478615a15fe6b3b0 (diff) | |
am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1
* commit '20cf0916cc6a4920b1d882a9478615a15fe6b3b0':
Bug 5585323 New system permission for media decode
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions