diff options
| author | Vasu Nori <vnori@google.com> | 2010-07-19 15:29:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-19 15:29:10 -0700 |
| commit | 0c7f4e5e81506050acbe4ef4182e431ee4bf65cf (patch) | |
| tree | 84f9ae1e55b173a9692d2868c7d1a956b7c47de9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f0c6f6437d7f0a9a8ad822547debf6ec848c8726 (diff) | |
| parent | 9f63ea27d5848e9bfb648d18331e50003bb84bcd (diff) | |
am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp
* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
fix javadoc error which breaks SDK build in gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions