diff options
| author | Xia Wang <xiaw@google.com> | 2011-11-28 16:07:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-28 16:07:13 -0800 |
| commit | 748025579912f92609cadd71786805e10281858d (patch) | |
| tree | b302e2117142da3aefbc56d8cdef2013b2b1d898 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d3ea6b40bb8f0fbc2a877963db1ab4fa0fc02b2f (diff) | |
| parent | 6c509ef0bad761feecfd94b66d532ae05b450317 (diff) | |
am 6c509ef0: am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901" into ics-mr0
* commit '6c509ef0bad761feecfd94b66d532ae05b450317':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions