summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2010-04-23 14:53:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-23 14:53:09 -0700
commit3fad8a6b3dd8f6f7096e00d965e7ac2742346145 (patch)
tree0647a68e25a4a6329cc0572a75dee37b8fd3dc19 /opengl/tests/gl_basic/gl_basic.cpp
parentaba26a8ba4abc1645d2131ea2d8a0434364b4f80 (diff)
parent88bbe89139c49775c6e4d5522ef06c1d471edcac (diff)
am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Merge commit 'f6adae7866e893afa05b5838bdd244648a66ac3f' into kraken * commit 'f6adae7866e893afa05b5838bdd244648a66ac3f': Fix bug 2619062 Music is routed to Phone speaker, though it is
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions