commit | ffd09065a333f0c102e8ccd5bedfb3775c1f2dba | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Tue Jun 14 18:56:05 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 14 18:56:05 2016 +0000 |
tree | 8d8fd0ad172430fb7408dc278ea82650d2870d2b | |
parent | b0cba526b1e7df19e2a6174073d092552d30be11 [diff] | |
parent | c6f39a0c365bf447fa9455a93fce2382ebe5478d [diff] |
Merge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev am: c6f39a0c36 Change-Id: I650941fee78fa9cefcc349e299865103e15216d2