diff options
| author | Stephen Hines <srhines@google.com> | 2011-03-04 01:00:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-04 01:00:59 -0800 |
| commit | 07617fea01fd0d77128cdd19b93490a9cdbea02d (patch) | |
| tree | ed6c22efceec5c172078b26efc30ff8118934ba1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5ef7449d28a058f4084020416d668fca4dd1b6c7 (diff) | |
| parent | e5841d7538583420d3bad1c77ad428243f7b7054 (diff) | |
am e5841d75: (-s ours) am 3080b85c: Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1
* commit 'e5841d7538583420d3bad1c77ad428243f7b7054':
DO NOT MERGE: Fix typos in RenderScript docs.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions