OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Wed, 16 Sep 2009 23:22:13 +0000 (16:22 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 16 Sep 2009 23:22:13 +0000 (16:22 -0700)
commite525eef4b8e284ac8eb023bd0df4eeed37916d4b
tree565020de633597ec0e49429478918b1c27b47d22
parentea8844811d1b0965f5c2f43006c0a08bcd73f23a
parent62e73f466e52b98ecc2eef85010618a655b40924
merge from open-source master
include/media/mediaplayer.h
media/java/android/media/MediaPlayer.java