diff options
| author | Elliott Hughes <enh@google.com> | 2010-10-04 18:55:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 18:55:32 -0700 |
| commit | 465ec633d7648e3d45e343056b0f023054ab0ee5 (patch) | |
| tree | ad0f6e6006ddeb3b24e08d56646d0aa340825607 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 126b49d9398095f07f3d26798acc999fe47cef62 (diff) | |
| parent | 58db5f304dff891183f18105435db52e8d8782e7 (diff) | |
am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
Merge commit '7280f2155c37b00359c3fb050e2b067dcd74db40' into gingerbread-plus-aosp
* commit '7280f2155c37b00359c3fb050e2b067dcd74db40':
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