tree ae2f8bf640c4b66b7e645e9462ab34037d790e8b
parent 8d32201d4a6caa7983ae002a76d69d511a804e0a
parent 6a93a9e982300acf99678eee1935ff730fadb642
author Robert Shih <robertshih@google.com> 1471890740 +0000
committer android-build-merger <android-build-merger@google.com> 1471890740 +0000

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

Change-Id: I5f0a4039ff49ef3e5afabfce151a04fb58a45ae7