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:45:13 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 18:45:13 +0000 (18:45 +0000)
commit6f8e939c584047179483840480f10dbc956d70f6
tree7d11f31236516c4c2da1ab1dfb3cd0f102fb553c
parent47932efd3d798d0a9cb4b95b4d5a1e2139366946
parent82bc8c451132353b9f2a269c0387e705f79fdc2d
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