diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-06-11 18:28:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 18:28:57 -0700 |
| commit | 3dd4817f0e746c20e4a6362f9f9705916011d6e2 (patch) | |
| tree | ba7baa1cbc2a4ab93b7523a90df9c8b132aab577 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6c424e2fb159a52818504410a8c5229e595f12e4 (diff) | |
| parent | 1b02178d16da6817d509e70107a9e0364f058236 (diff) | |
am 94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Merge commit '94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2' into gingerbread-plus-aosp
* commit '94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2':
More StrictMode work, handling violations in ActivityManagerService.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions