diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-28 17:22:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 17:22:09 -0700 |
| commit | 1b82e8a1a256aa050290c4900c5f65247ba4e183 (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 06c5679c584afdcaba17fdaecd5eb1fc5ef8547e (diff) | |
| parent | 12fac3a5c9034d11156eb1fb3d4a3d96ead19dab (diff) | |
am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp
* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
Check for the DEVICE_POWER permission in userActivity.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions