diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-29 11:02:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-29 11:02:55 -0700 |
| commit | b93f6bad12d59e731cc03abb28c7c2c796e7e7e5 (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fb46cd118bc2ac7c784ab653cdb38c5912dea0d5 (diff) | |
| parent | 8a663231b15db9286c1ecde0395d69f087a56059 (diff) | |
am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp
* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
Revert "Revert "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