tree 6d718266a3587e3ce5f99cf717edb0e02eccd003
parent e50b5789ce864ba6f0c9a855e5f9f1a4a1837932
parent e124d76caf35f2e35a2ca48511367185086561cd
author Android (Google) Code Review <android-gerrit@google.com> 1251133860 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1251133860 -0700

Merge change 22379 into donut

* changes:
  	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java         Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.