diff options
| author | Jeffrey Tinker <jtinker@google.com> | 2011-05-23 18:47:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 18:47:17 -0700 |
| commit | b152f82fa1ab076cf45e74374fa35acdad8a103b (patch) | |
| tree | 5a2e56885bf320a464e6b7c4e3f13f68f0f03f59 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 73bd833f1db8684b363c7fb70625684cfbe0bcf3 (diff) | |
| parent | 58b5ba395cff5b8e1becec6aa5fa2c0c66fc4a5b (diff) | |
am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2
* commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa':
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions