diff options
| author | Joe Fernandez <joefernandez@google.com> | 2011-07-08 17:53:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-08 17:53:06 -0700 |
| commit | dce135615532e9f94d88d4fd334c56ce54184244 (patch) | |
| tree | db6bc2424ef56e35274cec5db44d7115d28e60b9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d60083b00a1383fef36b4979c5872727cd459edc (diff) | |
| parent | 1a1c333424ea1d3f4a1d2fc339ea90c790cc962c (diff) | |
am d1c15f96: am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit 'd1c15f96dd2e3b07da6968ea54f6f2bdebe8e190':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions