diff options
author | John Wang <johnwang@google.com> | 2011-11-14 12:11:35 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-14 12:11:35 -0800 |
commit | 33ccc4353f1c505296fa645a2765fa020993688b (patch) | |
tree | 430cd800c1cc1c00281d29d04f779eea4c1bf9a1 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 9eb4fc62ee5b58b5a48c6a48dd018210145c422e (diff) | |
parent | 82e11a5992586dd0d3144a27e98cec4a9162ef49 (diff) |
am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
* commit '72a31ab98f8687aa48fce028d54e79929780a302':
[maguro] Fix STK issues
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions