diff options
| author | John Reck <jreck@google.com> | 2011-05-23 16:53:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 16:53:28 -0700 |
| commit | 57162780ea9c5b9565c2ae78b088e0c020c7489f (patch) | |
| tree | 5a2e56885bf320a464e6b7c4e3f13f68f0f03f59 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2f118cd350513991f400d7f887c0e8345cba6a20 (diff) | |
| parent | a59f1573e0154a995005b6f3498f6008b584f48e (diff) | |
am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
* commit '82de141db736b95b0e388ff060e2d2535192d769':
DO NOT MERGE Use previous version if version is a codename
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions