Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-plus-aosp * commit '1e495da19f3f0061de38821a4ac733dca833b3eb': Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java