diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-10-21 09:51:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 09:51:01 -0700 |
| commit | 58daba308327bf8752166bc65924be8645037b97 (patch) | |
| tree | 54b76e53206c2793446cf8721ef56ae37919ca70 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 653b5e25b508f9c911bb61ca1a74d649b6800642 (diff) | |
| parent | 343236b2f3b811b11aa23bdce6a0a8c5c73cff0b (diff) | |
am aefcdde4: am 4944fdd7: Periodically scan wifi when wifi is not connected and wifi lock is grabbed in SipService.
Merge commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6'
* commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6':
Periodically scan wifi when wifi is not connected and wifi lock is
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions