diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-03 11:42:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-03 11:42:05 -0800 |
| commit | a4c4fbe3b04b14fe03aee40695c6a2e2e8d44f35 (patch) | |
| tree | a14464123bebfff64910d7c44b1759a699a6caa8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f039adc726a77d314cadf894fdc7d3044c14bc2f (diff) | |
| parent | 46eda25d96e5da2a61e5b289ee86d386e266eaed (diff) | |
am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
* commit 'e91e5f6e9db4db5cd53836c901a7f80c11abb55c':
DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions