| commit | f225daf883e0c7eed51bec7fadc897fa6a0a2418 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 22 19:05:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 19:05:53 2016 +0000 |
| tree | 61848bdf262e9a589ecb91cd334c09eeb8fea201 | |
| parent | 9ac28e62e62a64cff92f3ac2beb17fe22b66c78c [diff] | |
| parent | 3662106826084151f98ce591434e87596eb5ae59 [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 Change-Id: I4b0b972deecd8806f13531a20a6740d2b8c5db6c