tree 05e7642b26601ba2960af42f2ac1ae4f09ed9b5b
parent 66640e3a703e71adc7db5394d51d1c8225947aba
parent da8165537cb8de88c0ad02c357a1a63af163dea9
author Robert Shih <robertshih@google.com> 1471895191 +0000
committer android-build-merger <android-build-merger@google.com> 1471895191 +0000

Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d am: 21cc1102b4 am: e13b8f2d61 am: 730c25e0dc am: 6a93a9e982 am: 71b72fc26f am: 21c660a129 am: 231bf612d8 am: 919a5ab5d8 am: 05593ed8e1
am: da8165537c

Change-Id: If9fdc1107ac7343827c1b137d260ec59a8f37a7b