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