diff options
| author | Joe Onorato <joeo@android.com> | 2010-10-11 13:55:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-11 13:55:15 -0700 |
| commit | 167af513b1672b6c55caba13c95e17bcb45efdf1 (patch) | |
| tree | d0f9cd06c9da12a52a9e6f2311a9b4eaa9e5c497 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 49dae8a7e774148acd32c3ee599a884b14cadbc9 (diff) | |
| parent | 09ed308945358e97dcb0caa307c3e9566b4b1bf1 (diff) | |
am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread
Merge commit '446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp
* commit '446547af37fd10142f15f6a9b3ac3007c6473981':
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