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:59:56 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Jun 2016 18:59:56 +0000 (18:59 +0000)
commit8a924cae8e840404f62006ea8d316b65013768b0
tree7d5b4241431b5092558b4627d3b24e3722832f7d
parentb9cabc7fccb1b54d7c848d531aad738f531ab0db
parentffd09065a333f0c102e8ccd5bedfb3775c1f2dba
Merge \\"MediaPlayer: fix java doc for setSurface and setDisplay.\\" into nyc-dev am: c6f39a0c36
am: ffd09065a3

Change-Id: I5ac47afdfa0b5e6cd59d3423eea12b9cad3a31d5
media/java/android/media/MediaPlayer.java