tree 7dd8b28e9887a35f639fee3ba6807f79db95db92
parent e8d82e5d2d1639906d0d3c91354f3e311cd875ae
parent 62a3aa745ab5462f3df60652b8a587e8aba3a029
author Wei Jia <wjia@google.com> 1492809576 +0000
committer android-build-merger <android-build-merger@google.com> 1492809576 +0000

Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev
am: 62a3aa745a

Change-Id: I09feef76ad0ea67eaebecb6a14494b4fcb33e1e8