diff options
| author | Mathias Agopian <mathias@google.com> | 2011-06-16 18:18:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-16 18:18:47 -0700 |
| commit | a2ceb7bc2a14f566443a9eb4fe1096c85df79988 (patch) | |
| tree | 02a86dc22485fd8ce11695a5684f670154c34610 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 01c92ac2a475111bfd76c2b6e033aaa1447dc720 (diff) | |
| parent | e2fc756f7d946da72991feeb8b569258f0b203eb (diff) | |
am 3b916233: (-s ours) am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '3b916233cbbbcc5bbc703213af5e647910956cbc':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions