summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2010-04-07 13:33:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-07 13:33:11 -0700
commiteabd04795a0ebb4ed107e5d40ce7e58aa5bdbf34 (patch)
treecdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp
parent34e03df4e998aed8d5ffb3524aac7dfbf85580a6 (diff)
parent138da33e456edd71e2e37bb82776359dadf90735 (diff)
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 'e43e563e73ab6b1af2b3276a4917976b112f5cda' into froyo-plus-aosp * commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda': 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