tree 9a4ea649860b32a9639d2c7cad9a8d19e2a794f4
parent 9af3fd5c98fe5652233058d945a50a2f9172891a
parent d36be4e4d85a2671de4f410b5ed1a6d1314ab553
author Wei Jia <wjia@google.com> 1500407810 +0000
committer android-build-merger <android-build-merger@google.com> 1500407810 +0000

Merge "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1 am: 6b79fa9965 am: 29204646b9" into oc-dr1-dev-plus-aosp
am: d36be4e4d8

Change-Id: Ia8da3f4e146141d9c15f89e020ebe7540125431c