| commit | 2180a83292987f2289650ff0853e031cd3c796ed | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 22 19:15:00 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 19:15:00 2016 +0000 |
| tree | a1236c80cb0ec07656059e5aad84a662448eadc3 | |
| parent | 021a8208de80c3d310192c84e105cc638d8695ed [diff] | |
| parent | 67fd8ff784f2d4bb13986749516f3414b857f0f4 [diff] |
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 Change-Id: Ie3bef23bbcac63e5a51c33a19b7e300ba5860b3b