tree 05e7642b26601ba2960af42f2ac1ae4f09ed9b5b
parent 20bad99de2fb09ffe04dac4435c21f13dc0dd888
parent 32982c0cc6b4a83625ae80c3ac360ef06bf5ce15
author Robert Shih <robertshih@google.com> 1471895191 +0000
committer android-build-merger <android-build-merger@google.com> 1471895191 +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: 50859c3229
am: 32982c0cc6  -s ours

Change-Id: I213d19d95a8a9fc2d04c00a7e9b4f46b70b9a76b