diff options
| author | Basavapatna Dattaguru <dattaguru@google.com> | 2011-01-26 22:54:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 22:54:41 -0800 |
| commit | ac2e3007d901b26aeaa94f2bb0be137b8ea12084 (patch) | |
| tree | 33fe9c9c584ec0aec3aa4d1afa05b0bbbbdbec3f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e095e5351f705fe097e5c26ae6a077652c2a389c (diff) | |
| parent | 19979c298b9a9f71d585d524ff731efbc5fd6e75 (diff) | |
am 90982936: am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
* commit '90982936a026f1f951fe06ad4d2bcfd72a99ab8f':
Revert "Video editor CTS: Framework modifications"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions