| commit | 32982c0cc6b4a83625ae80c3ac360ef06bf5ce15 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 22 19:42:27 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 19:42:27 2016 +0000 |
| tree | 251c3e91620288d90df91b6c1d507e5a34d954e6 | |
| parent | da6dd732bd619642d2267bb37bfd402ebd6f25bd [diff] | |
| parent | 50859c322975156d332f715d4d64dad95469f7d8 [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: 50859c3229 Change-Id: I584eb0d8a0605201f47c732b24689348937442b7