summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2010-04-07 13:37:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-07 13:37:21 -0700
commit86f84b7653ee272f4e21c9578fc6be8beef4f67e (patch)
treeec1cb255bbdad108ce60ceb7267e305a4f0f34e6 /opengl/tests/gl_basic/gl_basic.cpp
parent5f6e847ad24fa2e99ef7acf26a5b18d3b9c7c608 (diff)
parenteabd04795a0ebb4ed107e5d40ce7e58aa5bdbf34 (diff)
am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
Merge commit 'ca9a083bcf1ad753812e14f506c210a2104342c5' into kraken * commit 'ca9a083bcf1ad753812e14f506c210a2104342c5': Don't check whether a specific named activity supports mp3 playback,
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions