summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-01-24 11:49:16 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-24 11:49:16 -0800
commit95460d7cbc1507cb1908643172b1aadc82cca6cf (patch)
tree485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp
parent4d5a59c80de5a13d5ddc2cb07b2dbf3411d49320 (diff)
parent666b06d8f4c41a0355ed3b8770ff7e8c11147923 (diff)
Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions