diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-19 13:38:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 13:38:00 -0700 |
| commit | 5a2d4572c9b471c00fcc0925636cdc992e9ab54f (patch) | |
| tree | 4afc4ae360009933b125f1c83294af7beb4e2049 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e123ef9a68ba190bc4db2b692830a02141c7d986 (diff) | |
| parent | 42b6a23ef35345fa8a00c36bf6a25d8f97aaf7c9 (diff) | |
am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'
* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
Fix Vibrator permission CTS test broken earlier.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions