diff options
| author | Xia Wang <xiaw@google.com> | 2011-03-10 15:57:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-10 15:57:27 -0800 |
| commit | af268fff07f15081e072b1685abd3d454739cbf0 (patch) | |
| tree | 2e318f83df07f569446359228074dd18e56a17df /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ba0f2a34677e53fa6183a3e0523d6095b522a197 (diff) | |
| parent | 416132888bbd1d6c514f88b6f97eed6bd6b3213f (diff) | |
am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
Add WifiStressTest to Wi-Fi only test suite.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions