diff options
| author | Robert Ly <robertly@google.com> | 2011-11-11 20:37:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-11 20:37:06 -0800 |
| commit | 17161d7a549c34828d3bd377f5dd65b7a46ec1f0 (patch) | |
| tree | b4d1b51bd2e29b2d6ad1c45423b1cf022ae9e28c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8661489545eaa4aac641a8bc1a24b1647258a62e (diff) | |
| parent | 6be50a40549a16a3aa3fc1d4360483ab3e898501 (diff) | |
am 6be50a40: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '6be50a40549a16a3aa3fc1d4360483ab3e898501':
docs: ndk r7 rel notes
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions