Merge commit '9a7efa452909b7a4f12840c44291c51a699acade' into eclair-plus-aosp * commit '9a7efa452909b7a4f12840c44291c51a699acade': modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
Merge commit '9a7efa452909b7a4f12840c44291c51a699acade' into eclair-plus-aosp * commit '9a7efa452909b7a4f12840c44291c51a699acade': modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java