diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-09-28 20:21:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 20:21:48 -0700 |
| commit | 7cc3fa06593b57cf59c1b931a1fd3418aa0da12b (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 135f19c8dc0357530bdd0a23ff94496dcd1c82af (diff) | |
| parent | 6f4ae27e33d74676119a4b04c93b6c34eda9c211 (diff) | |
am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
Merge commit '05e110506156a1b782232833b907afb428802b69'
* commit '05e110506156a1b782232833b907afb428802b69':
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