523018f182
Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair * commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8': Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"