diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-07-28 04:11:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 04:11:03 -0700 |
| commit | c1bab16956d31b6b6ab9e085a852e40b6dfa3a35 (patch) | |
| tree | a49d05563de9b9b0a162a3c2f50f003ff4430168 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 795c4cc84cab0f564ac85bddbe8eb3ada04698cc (diff) | |
| parent | 1b55aad8ef82b79303302fa44bfee806801f3ca1 (diff) | |
am c40d714c: Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'c40d714ca520257bcb5ef2e03e83ea3273d3a0ec' into gingerbread-plus-aosp
* commit 'c40d714ca520257bcb5ef2e03e83ea3273d3a0ec':
Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions