tree 12505a0e84fca870551809a23f6fc6235ee2e7c0
parent 4e9718d6ae3433a3f78fddf158a15701101ba781
parent 8c937a17667704ee9ba60663f4c4b76f3c3a0f78
author Yu Shan Emily Lau <yslau@google.com> 1251134065 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1251134065 -0700

am 8c937a17: Merge change 22379 into donut

Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair

* commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java