diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-19 12:25:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 12:25:46 -0700 |
| commit | 42b6a23ef35345fa8a00c36bf6a25d8f97aaf7c9 (patch) | |
| tree | ccc2e69bb92259cb595ebc0359809599dcc39cbe /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | eba63fd6f6e25d914d37e30486426f9524f69191 (diff) | |
| parent | 8e8732bfa9c7235f5627b47b4cc5d8807c459004 (diff) | |
am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp
* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
Fix Vibrator permission CTS test broken earlier.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions