tree eb1041254754da9b62f7a1d528ead3fb024a75d6
parent 5f31e40cd5419046b88f94a6bf43697bfee03055
parent d554814b49ae68a1e4a24f628bd0fed73a12ad08
author Wei Jia <wjia@google.com> 1465611800 +0000
committer android-build-merger <android-build-merger@google.com> 1465611800 +0000

Merge \"MediaPlayer: fix state for setPlaybackParams.\" into nyc-dev
am: d554814b49

Change-Id: I370dc96e87250b20d5adaeb32f09df96c105d62d