| commit | 5e86258dca0694303b2549aaff1e22b30521a28f | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 22 19:46:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 19:46:33 2016 +0000 |
| tree | 251c3e91620288d90df91b6c1d507e5a34d954e6 | |
| parent | ac501846cf95aa5d9f3ddb3a2da85bc45f152268 [diff] | |
| parent | 7a17981a0170268282e83d8816bdc9cf1aa18835 [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 am: 7a17981a01 Change-Id: I06484948fd804b9aaf9fafd6d3e27529bad3e76a