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:48:21 +0000 (18:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 18:48:21 +0000 (18:48 +0000)
commitf49ac6ef61935ad636305dd1f3a3d4964b7c4f61
tree43dfd3a2e8ff065c81a7c12d289d0788afbb686e
parentb83d53d49a72a58459d634f5d06ef5f730969cb3
parent6f8e939c584047179483840480f10dbc956d70f6
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

Change-Id: I5373a4e935db09eb7a98f55cb5266f475b3dcd01