tree 61848bdf262e9a589ecb91cd334c09eeb8fea201
parent 17744ab9d700078d1268dab2a070e6ef8cf962ec
parent 21c660a1290272011b46522c2e8e41ea11100e90
author Robert Shih <robertshih@google.com> 1471891460 +0000
committer android-build-merger <android-build-merger@google.com> 1471891460 +0000

Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d am: 21cc1102b4 am: e13b8f2d61 am: 730c25e0dc am: 6a93a9e982 am: 71b72fc26f
am: 21c660a129

Change-Id: I35a947ad41626814622f844f17ad2d3cac5c1ff0