tree ae2f8bf640c4b66b7e645e9462ab34037d790e8b
parent 71b72fc26ffcdf87d6e2e5cb23d12128155245bb
parent b83d53d49a72a58459d634f5d06ef5f730969cb3
author Robert Shih <robertshih@google.com> 1471892212 +0000
committer android-build-merger <android-build-merger@google.com> 1471892212 +0000

DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b  -s ours am: 08eab78209  -s ours am: 081388d875 am: d6e7dcbb64 am: 47932efd3d  -s ours
am: b83d53d49a

Change-Id: I104f430d0bf1897e59bffdfe2bc3e13a9b058a1c