Merge commit '2bfe8ffab5af1ea7cba35436ddbae4cc821bb2ba' * commit '2bfe8ffab5af1ea7cba35436ddbae4cc821bb2ba': Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit '2bfe8ffab5af1ea7cba35436ddbae4cc821bb2ba' * commit '2bfe8ffab5af1ea7cba35436ddbae4cc821bb2ba': Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"