tree 251c3e91620288d90df91b6c1d507e5a34d954e6
parent 8b1794572a655236a4d1c3473fb742903cf8f4d8
parent dd539ce2c41597369acb414460db9614d57b62f6
author Robert Shih <robertshih@google.com> 1471895192 +0000
committer android-build-merger <android-build-merger@google.com> 1471895192 +0000

Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d am: 21cc1102b4 am: e13b8f2d61 am: 730c25e0dc am: 6a93a9e982 am: 71b72fc26f am: 21c660a129 am: 231bf612d8 am: 919a5ab5d8 am: 2dfa98c232 am: 9c51a221bf
am: dd539ce2c4

Change-Id: Ie241bbc4fe45f3d393ad2900f3e8ae7e127e815b