| commit | 3662106826084151f98ce591434e87596eb5ae59 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 22 19:01:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 19:01:55 2016 +0000 |
| tree | 1127ac15fddbf89e6b8c124d7312d4442f01ec37 | |
| parent | 4748e19a9723ec69599c997ceabcf6d47d10906e [diff] | |
| parent | 5d7ca78437bb974ecf3f40da17bedaeffbb4948d [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 Change-Id: I92413bf62f91448e87ae56cd1ad58fd9bfc9e989