diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:41:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:41:50 -0700 |
| commit | 75bcd737770f85114673c4411b8e2ecc0dd32bdf (patch) | |
| tree | de4b9fce9ad3e87543de1a4335f9f1d3d97d426c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f53f9c6d3668490f6c68f5c094c28f645c1b3da3 (diff) | |
| parent | 4ddcb75861cfb2835fcc20f2071222d2f55450ba (diff) | |
am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '4ddcb75861cfb2835fcc20f2071222d2f55450ba':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions