diff options
| author | David Brown <dab@google.com> | 2010-09-15 11:15:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 11:15:14 -0700 |
| commit | 62eff51f5ce955a207c8c90e8ed61e7d715692b3 (patch) | |
| tree | 1b4d284d76610faa682262216e18d7956df073d7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ee37919e76ffa64d7359ef77a1b7539782887586 (diff) | |
| parent | 47638c2d8e56a043ab41130be4efda5c818cc15d (diff) | |
am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp
* commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed':
Mark MODIFY_PHONE_STATE permission as signatureOrSystem
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions