OSDN Git Service

Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am...
authorRobert Shih <robertshih@google.com>
Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)
am: 7fa7052231  -s ours

Change-Id: I5dddb4aeffa111dfda64e335d7baf7758a1740ee


Trivial merge