OSDN Git Service

Merge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev
authorWei Jia <wjia@google.com>
Tue, 14 Jun 2016 18:58:55 +0000 (18:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Jun 2016 18:58:55 +0000 (18:58 +0000)
am: c6f39a0c36

Change-Id: I1c6dea8e60e96804c9d7564b367c21b146728072

1  2 
media/java/android/media/MediaPlayer.java