tree 34e702605130e4e4f8e9e458799e70fedcd8e8b7
parent a15f0fc6f70a5a67e3546e2816f63e6c5174cc6d
parent 0efb0868841cc1c2b5a669b39880d931f54f705a
author Android (Google) Code Review <android-gerrit@google.com> 1241714079 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1241714079 -0700

am 0efb086: Merge change 1120 into donut

Merge commit '0efb0868841cc1c2b5a669b39880d931f54f705a'

* commit '0efb0868841cc1c2b5a669b39880d931f54f705a':
  Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest