| commit | 50859c322975156d332f715d4d64dad95469f7d8 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 22 19:38:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 19:38:38 2016 +0000 |
| tree | 5b7a2e5385e7d0b9d1e59335dd32ffc3615246c5 | |
| parent | f3f957863bc1d311d1b1685bfd741ed32cc5034f [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: I11df40c7f481bbf3e81dbc3c4224c467dcf0c51b