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