| commit | 6f2d58506e77748982339ad3217367b321a42b52 | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Mon Aug 24 10:14:25 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 10:14:25 2009 -0700 |
| tree | a4795890653d2bab4a2d63af4574a2cd8bac54fe | |
| parent | c16d69317ba21516627eed4c6495e8f6b13d463c [diff] | |
| parent | e7004a70a93ab24bbebc219a3d54a4ea8c680772 [diff] |
am 8c937a17: Merge change 22379 into donut Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair * commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78': modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java