summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-04-22 16:26:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-22 16:26:59 -0700
commitc1353e2873a9d07113906e88496964fb59091740 (patch)
tree532df9facad6571445d85a65fb59ba0580ea5050 /opengl/tests/gl_basic/gl_basic.cpp
parent0bc7251d3a10b6ca5e97312f13c1675e6369c6ba (diff)
parentc4384ad5c76ece7e4f530d4a92392ad3f534cbe8 (diff)
am 90c6aec1: Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo
Merge commit '90c6aec10f969acf9b171b82920480fb6aeb007f' into froyo-plus-aosp * commit '90c6aec10f969acf9b171b82920480fb6aeb007f': Fix issue #2619247: Music sometimes stops playing when navigation talks
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions