summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2011-11-24 09:41:48 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-24 09:41:48 -0800
commit5199713e73146e59802024b3d077ee5a562d1084 (patch)
tree85822ab685c49f5d1d6d926edcc427799019f3a8 /opengl/tests/gl_basic/gl_basic.cpp
parent8bbf10a95129b548421bee1b0890e92761685742 (diff)
parent593e3ffd1461bf8ace0e2ee5c58278dca7975e9b (diff)
am b567c41b: am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
* commit 'b567c41b00fd196a2994f3cf8090b8a503c04939': Fix regressions in TTS completion callbacks.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions