Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair * commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78': modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair * commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78': modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java