OSDN Git Service

am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworkte...
authorYu Shan Emily Lau <yslau@google.com>
Tue, 25 Aug 2009 17:42:02 +0000 (10:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Aug 2009 17:42:02 +0000 (10:42 -0700)
commit479a38ab8df5cefc2c8442bfa0154bf955ad5ea3
treeab50c3fb499b98adafb5a05f5592cb0211a53688
parente99a269ec418e7b3c8bbcfca953457d9776abe82
parente7004a70a93ab24bbebc219a3d54a4ea8c680772
am b56de747: Revert " modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"

Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair

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