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