diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-29 22:13:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-29 22:13:21 -0700 |
| commit | d4a1956aecc714e11c4cede6490e56b48ecab011 (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3382fbfea44baddf0a4dd792e7c81c1cb3355a79 (diff) | |
| parent | b93f6bad12d59e731cc03abb28c7c2c796e7e7e5 (diff) | |
am 198297b4: am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
Merge commit '198297b495d975cd4889f5136cd69368bd319eed'
* commit '198297b495d975cd4889f5136cd69368bd319eed':
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