diff options
| author | Dave Burke <daveburke@google.com> | 2011-11-10 19:39:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 19:39:12 +0000 |
| commit | 071f1ca094a8a011df77f12b9ece2e8a3468af97 (patch) | |
| tree | 45ab7a8485e687f48c3018251a854360161d65d2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fe9f00bcf4f9c1b36ffa5f3b723f41c713a5ec09 (diff) | |
| parent | 26c84db47da032a3fc1a56aa6bd82d610dde2dca (diff) | |
am 26c84db4: (-s ours) am b5dbf66c: am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
* commit '26c84db47da032a3fc1a56aa6bd82d610dde2dca':
Actually 59 fps DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions