diff options
| author | Joe Onorato <joeo@android.com> | 2010-10-12 13:22:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-12 13:22:41 -0700 |
| commit | a66d342f172ff7d0769bf1b7c164807bac4a6c7c (patch) | |
| tree | 4591eed5eaba8f05277ee3cfe83e339a2a7edc6c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6e9890672126e8fd72eb8a935315292f19b78699 (diff) | |
| parent | 167af513b1672b6c55caba13c95e17bcb45efdf1 (diff) | |
am 5be893a7: am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread
Merge commit '5be893a71aa72f54660496dd01cfad66adb86b8f'
* commit '5be893a71aa72f54660496dd01cfad66adb86b8f':
Don't throw when userActivity fails because of the permission check.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions