summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-04-22 16:30:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-22 16:30:01 -0700
commita4a0502342d1139270ebe266dff401ef70ea8844 (patch)
tree0647a68e25a4a6329cc0572a75dee37b8fd3dc19 /opengl/tests/gl_basic/gl_basic.cpp
parent27d6a25bc2479adcb57bf639528f109aee1b56e4 (diff)
parentc1353e2873a9d07113906e88496964fb59091740 (diff)
am 4bcdd6b0: am 90c6aec1: Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo
Merge commit '4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b' into kraken * commit '4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b': 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