OSDN Git Service

Merge change 22379 into donut
authorAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Aug 2009 17:11:00 +0000 (10:11 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Aug 2009 17:11:00 +0000 (10:11 -0700)
commit8c937a17667704ee9ba60663f4c4b76f3c3a0f78
treeba8f9c9f988f500756f35c109f0f50752f169dc9
parent36d5aaec2ee1f11ea80639c8194e4aac2be3892d
parent051d8d6692a4f8d852f6336d1e31a3a907913ac7
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.