diff options
| author | Joe Fernandez <joefernandez@google.com> | 2011-07-08 09:39:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-08 09:39:22 -0700 |
| commit | 104a2351c7a0773d4604708b91345385d52c9889 (patch) | |
| tree | cc677d7f751d9900458c481845dead6e9404d065 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f983682b367387c4e3b4f2b35846a60da85c1482 (diff) | |
| parent | 36ff879a9256b5d02d2aa920fec9fdfa66a74e92 (diff) | |
am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions