diff options
| author | Robert Ly <robertly@google.com> | 2011-06-14 16:41:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-14 16:41:55 -0700 |
| commit | 38f30693ced45553cb684ceb7a9e3be335424706 (patch) | |
| tree | 01e09e2a5586c79999831795bce23b509374fcce /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | abcc8dd1d3e02da66d44b232f1a77d1e48672dc8 (diff) | |
| parent | f99d25729a7b2f10d2ee78e4933d6265aee78ee8 (diff) | |
am 1dbb7075: am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
* commit '1dbb707592f0aff35e5ca1115f7ee278a5977c42':
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions