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