diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-06-11 18:30:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 18:30:09 -0700 |
| commit | 34949805bcc96dba9b7a92ce2f26114c3c72f0b5 (patch) | |
| tree | 148065c8ad7acd5ff445c1e7af5f5188f8c06a33 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7918c38542f535430689854e1c2970a10f07eea6 (diff) | |
| parent | 3dd4817f0e746c20e4a6362f9f9705916011d6e2 (diff) | |
am 11bd9d1e: am 94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Merge commit '11bd9d1ec20ce3bbd3791b537faad429a1ca87e7'
* commit '11bd9d1ec20ce3bbd3791b537faad429a1ca87e7':
More StrictMode work, handling violations in ActivityManagerService.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions