tree 2b2c7589065bf2dc4bd9a4efe765f8ea91e455a9
parent 919a5ab5d88354fa03bb02cbf8372d4718f54b10
parent 9ac28e62e62a64cff92f3ac2beb17fe22b66c78c
author Robert Shih <robertshih@google.com> 1471892994 +0000
committer android-build-merger <android-build-merger@google.com> 1471892994 +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 am: 015c71c8fd am: 4748e19a97
am: 9ac28e62e6  -s ours

Change-Id: I71d6794eba89fc87f5cc415cde21b56e804b77b9