Merge commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b' * commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b': modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
Merge commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b' * commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b': modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java