From: Robert Shih <robertshih@google.com>
Date: Mon, 22 Aug 2016 18:45:13 +0000 (+0000)
Subject: Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am... 
X-Git-Tag: android-x86-7.1-r1~24^2~8^2~4^2^2^2^2^2~7^2~11
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6f8e939c58;p=android-x86%2Fframeworks-av.git

Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231  -s ours am: 91ec9a6fd3  -s ours am: a9c1e43d89
am: 82bc8c4511

Change-Id: I3765b00a451793307c9d23431f8b354bbe71b7df
---

6f8e939c584047179483840480f10dbc956d70f6