tree 22450653d13cb429a2d0f54eb263e0cf2f15281a
parent 2e3ff09fc63762cb2c65118dc401231fa4a5757a
parent 8bd5cd6f9c7ea78169d2223ac1091615ee9fc045
author Android Build Merger (Role) <android-build-merger@google.com> 1500407619 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500407619 +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