diff options
| author | Robert Ly <robertly@google.com> | 2011-06-21 15:28:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-21 15:28:26 -0700 |
| commit | 94ceb1156cd2e3308cd0a17012b13489a95ed695 (patch) | |
| tree | c16c788b2e7a62de5b85b9fecf5b9b2674e76c8f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d871b3ac28044342b0bd7d8a453c2110254cf7b2 (diff) | |
| parent | f5b912109169c9b3affcb699c41970d758f6e253 (diff) | |
am 5520ec6f: am 152e5f56: am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '5520ec6f8958d9030a4c9b606b25be6190c75a08':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions