summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2010-04-13 09:54:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-13 09:54:47 -0700
commit54fddcb1e6c12d46059493401a1026c908fe5261 (patch)
tree3e5f86120f1ff365c1753580da989ae35d07c503 /opengl/tests/gl_basic/gl_basic.cpp
parente2b7d4c5addd83a3ccaf9bf239581672b9d122c3 (diff)
parent35f3a77b07b6b6509f1ccf1a132f93095f4a7ac7 (diff)
am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
Merge commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db' into froyo-plus-aosp * commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db': Fix bug 2578813 Delay pausing music and routing audio for car docks
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions