diff options
| author | Raphael <raphael@google.com> | 2011-10-28 22:27:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-28 22:27:22 +0000 |
| commit | b53aab7d81101bc396aab87be872e83f03629edd (patch) | |
| tree | 55b1e64d15d96c0cad7e57e696aea66235a542c3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d714e3a1ff559dd9d22c87ed904be2a82692fcf8 (diff) | |
| parent | 48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b (diff) | |
am 48ba4139: (-s ours) am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.
* commit '48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b':
Cherry-pick f51125d from master to ics-mr0. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions