diff options
| author | Elliott Hughes <enh@google.com> | 2010-10-06 16:17:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-06 16:17:27 -0700 |
| commit | fa30d1e3057877745a1a6160d45484df1179dece (patch) | |
| tree | 50aa3ad08660fb96066b49ca042241fae09aeaec /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a80cbaa4df98a56f5753579f852c24139ccc8d84 (diff) | |
| parent | 465ec633d7648e3d45e343056b0f023054ab0ee5 (diff) | |
am 86214276: am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
Merge commit '86214276e05d81e4820862341ce9e2e3c83cd136'
* commit '86214276e05d81e4820862341ce9e2e3c83cd136':
Manually revert a single-line error inserted by OpenJDK.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions