diff options
| author | Robert Ly <robertly@google.com> | 2011-06-14 16:38:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-14 16:38:02 -0700 |
| commit | 947d3c64f520d12c0259d6bd391418b4ddf36494 (patch) | |
| tree | c45c57e57309fcb0b20e33a9262564834accdc5f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c23eb91771f0eccfdcf16bbdfb11ed5eb7e18797 (diff) | |
| parent | 02bae11c2e98f7122bbd49a89b27eb7b743f4e84 (diff) | |
am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit '194f47451ce3a0d346e362dfd8753057f41c765d':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions