diff options
| author | Vasu Nori <vnori@google.com> | 2010-07-19 15:32:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-19 15:32:10 -0700 |
| commit | 9127755c430b1daec2ab20e1657426a98505820c (patch) | |
| tree | 6c5e8d329134a56c5ff40a87a3ecf1325a0720b0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 10dd5ff7cf373464e6bf51d9ac11bb12f3e68924 (diff) | |
| parent | 0c7f4e5e81506050acbe4ef4182e431ee4bf65cf (diff) | |
am 3766ed3e: am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Merge commit '3766ed3eed6be0a9e78193166bab64bf25f02e81'
* commit '3766ed3eed6be0a9e78193166bab64bf25f02e81':
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