diff options
| author | Scott Main <smain@google.com> | 2012-03-05 11:54:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-05 11:54:36 -0800 |
| commit | 6c4faf74ae45ebd705620144150acfb677844523 (patch) | |
| tree | 4c02f4773b36ec00a11137fad44b960808cce775 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 79003f35945fbbb0c55c23e8fd33085c4f129423 (diff) | |
| parent | 6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403 (diff) | |
am 6d2a18b5: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403':
docs: updates to OBB guide for naming; plus other edits
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions