summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2011-11-28 16:04:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-28 16:04:39 -0800
commit6c509ef0bad761feecfd94b66d532ae05b450317 (patch)
tree4da553b3dd224695bc66fb6b7bea850018c1da34 /opengl/tests/gl_basic/gl_basic.cpp
parent3892889952b0ad3fa0b095c96d8ae2ae110585e2 (diff)
parentda822367886d68f997153c7edd5368f3dfb6d58d (diff)
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 'da822367886d68f997153c7edd5368f3dfb6d58d': 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