diff options
| author | Robert Ly <robertly@google.com> | 2011-06-20 09:50:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-20 09:50:39 -0700 |
| commit | f5b912109169c9b3affcb699c41970d758f6e253 (patch) | |
| tree | fcf60e712c8ec063d65d20af892cd7fd3e822c75 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0f0f4960f84202a76657e5b2b26dfeed28184042 (diff) | |
| parent | b41a023a5c4e08710ff796f341bdf18945a4f72c (diff) | |
am 152e5f56: am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '152e5f56762c9db80d2b65fda8b13e3914f05d86':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions