| commit | 523018f1828884e96b1265f3e347410280577945 | [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 | bc663706abc23092fb416c6dfe517d011e6a36bf | |
| parent | 91ba1c3f9d000928a4ba12d45d609b1c2e7066e7 [diff] | |
| parent | b56de7474d93e634f77be58a794fbd1b0e68f6a8 [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"