diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-11 06:06:52 -0800 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-11 06:06:52 -0800 | 
| commit | 6786cae1c4ab9e30dd178f30ac1778c4681c1eb3 (patch) | |
| tree | c910c88edc8906260902ca0825db4e8a2e9d643d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0d48d599883cce509d2c354d8982d89776fe1eb1 (diff) | |
| parent | ef22134e3b55535434d25d896951430585e451e3 (diff) | |
am 4135cb8e: am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1
* commit '4135cb8e43846e422bf760fd9b856c67cc4ec8f7':
  Support for USB accessory URIs
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
