diff options
| author | Gloria Wang <gwang@google.com> | 2011-05-18 09:30:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-18 09:30:01 -0700 |
| commit | f066f6cffe1f6757174f5c26e49ef6fc5524e3d5 (patch) | |
| tree | 384bd709bfdad1b99e928efef531b47d16a3d8f3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0aa7b104679eb95e18ee4560f2d222a9171f68cc (diff) | |
| parent | 0ec18622dddc39c69c4e5cc98805dfdcb4cb1c39 (diff) | |
am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
* commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions