diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-01-29 09:54:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-29 09:54:41 -0800 |
| commit | 4e486242d61f16a76561fc4e59b396f1187126be (patch) | |
| tree | b60da6c8c40f73796fb700626b8917375c7b4041 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1399426de9a67a9748229f753e23c0f8cf88f266 (diff) | |
| parent | 30acaa88510fda75f135ca0d26de80d6f91cc484 (diff) | |
am 2ba92c71: (-s ours) do not merge bug 3370834 Cherrypick from master
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions