diff options
| author | David Brown <dab@google.com> | 2010-09-15 17:43:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 17:43:34 -0700 |
| commit | b683612d2a2af1dcc5fb9857c765e70dee547237 (patch) | |
| tree | 1049acf697ef2fe83a12a74bbf426b864eba5ea6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b2a53d131b082e2f619f37eaa44b8e870bf6c8e3 (diff) | |
| parent | 62eff51f5ce955a207c8c90e8ed61e7d715692b3 (diff) | |
am 0237cf2e: am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '0237cf2eace5d35410e95f586fd40c3068c94582'
* commit '0237cf2eace5d35410e95f586fd40c3068c94582':
Mark MODIFY_PHONE_STATE permission as signatureOrSystem
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions