| commit | 479a38ab8df5cefc2c8442bfa0154bf955ad5ea3 | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Tue Aug 25 10:42:02 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 10:42:02 2009 -0700 |
| tree | ab50c3fb499b98adafb5a05f5592cb0211a53688 | |
| parent | e99a269ec418e7b3c8bbcfca953457d9776abe82 [diff] | |
| parent | e7004a70a93ab24bbebc219a3d54a4ea8c680772 [diff] |
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"