tree 05e7642b26601ba2960af42f2ac1ae4f09ed9b5b
parent 32eab9a973a402b91110498deed948db035ef4e9
parent 5e86258dca0694303b2549aaff1e22b30521a28f
author Robert Shih <robertshih@google.com> 1471895435 +0000
committer android-build-merger <android-build-merger@google.com> 1471895435 +0000

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 am: f49ac6ef61 am: 5d7ca78437 am: 3662106826 am: f225daf883  -s ours am: 67fd8ff784 am: 2180a83292 am: bef261ccde am: 7a17981a01
am: 5e86258dca  -s ours

Change-Id: I5c1a79703b751cf83987c6490e96ccc7d0f3db7d