From: Robert Shih Date: Mon, 22 Aug 2016 19:05:53 +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~16^2~9^2~3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f225daf883e0c7eed51bec7fadc897fa6a0a2418;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 am: 6f8e939c58 -s ours am: f49ac6ef61 am: 5d7ca78437 am: 3662106826 Change-Id: I4b0b972deecd8806f13531a20a6740d2b8c5db6c --- f225daf883e0c7eed51bec7fadc897fa6a0a2418