diff options
| author | Justin Ho <justinho@google.com> | 2011-12-16 11:54:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-16 11:54:01 -0800 |
| commit | 65cd774f303c00ea1cecfa706074467ce8ea4c7f (patch) | |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 678a2adf1a6570c1c6ecfc85d8c03b26715e0844 (diff) | |
| parent | fe7a2124ae9bbe056a208a17efc0fdf14b985799 (diff) | |
am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
* commit '043c5f8f1d9a8e9077e1c16af28509b30f00324d':
Cherry-picking Id45abeba and Ia065dec6 for MR1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions