diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-09-19 11:15:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-19 11:15:08 -0700 |
| commit | 5505ce16014a6679c6f28ac37d5e92b5d60caeac (patch) | |
| tree | 9999ac1b5384449e68732dc6a5144e4159a7ee14 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bcf581a8d6fb1bfb53161995d8c7fe490f236e41 (diff) | |
| parent | 376cdd6d595d9db4276366fcf623787c1060670d (diff) | |
am b5994789: (-s ours) am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Merge commit 'b5994789af9c676f8e067a4a8706d2177b7cc142'
* commit 'b5994789af9c676f8e067a4a8706d2177b7cc142':
DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions