| commit | 7a17981a0170268282e83d8816bdc9cf1aa18835 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 22 19:32:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 19:32:29 2016 +0000 |
| tree | 405b25a1282447438a0337c40b0de5f58d4c228f | |
| parent | c5579e3e24b228e6899d9000cb49e8deffd76458 [diff] | |
| parent | bef261ccde80a06257e51dc16efdc1ae5b356282 [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 am: 2180a83292 am: bef261ccde Change-Id: I793dce1a257258c203489aa0bd6604138b87e162