diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-11-10 05:42:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 05:42:39 +0000 |
| commit | d43759f0bce17f841343c88e4e6e4445d122f61b (patch) | |
| tree | 79afc9550a6fafe74fe411dc96b95a30a6ad7b25 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 17fe6c8d0712a494dd8c7eeae0048850972f0f2a (diff) | |
| parent | 036da41922c936d25b36fbc4b5927a0097ece330 (diff) | |
am 036da419: am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1
* commit '036da41922c936d25b36fbc4b5927a0097ece330':
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