diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-14 18:27:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 18:27:30 -0700 |
| commit | 27a8e6779711cdf5a4b8272ee75e0a3e9c2c365c (patch) | |
| tree | 10bbdf4e30a7754b144a7bff01e3266f57ea3cdb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0b8edc958255f815bfa0205161d754bc6c2c7ae2 (diff) | |
| parent | 70882ca39fd010abd93544ec6dd15a003601f24c (diff) | |
am 70882ca3: (-s ours) am ccdac700: (-s ours) am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
* commit '70882ca39fd010abd93544ec6dd15a003601f24c':
DO NOT MERGE: backport recent USB accessory changes from honeycomb
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions