OSDN Git Service

Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
authorRobert Shih <robertshih@google.com>
Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)
am: 4fb531e262

Change-Id: I3cb099c3fdf0c476a92392b185d782e980a463de


Trivial merge