diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-02-28 13:17:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-28 13:17:58 -0800 |
| commit | faaee3b41925c726907069fa2818c7784ac75bb4 (patch) | |
| tree | 1c6db7a9e7e55e8c51db4bd409c033b5adc03a55 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4b0caf3b838d390c87cc73e1d5c9a41eebff2745 (diff) | |
| parent | 58a10b93fd3c7f9b14a0a512d90fc8f8c7abf1d7 (diff) | |
am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
* commit '3333f8afb2d1eae8bfdb41fa87f86836ad8702f7':
DO NOT MERGE UsbManager: squashed commit of:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions