| commit | 67fd8ff784f2d4bb13986749516f3414b857f0f4 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 22 19:09:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 19:09:55 2016 +0000 |
| tree | 2b2c7589065bf2dc4bd9a4efe765f8ea91e455a9 | |
| parent | bae02c169158684894e6830e676af9bb4050fcbb [diff] | |
| parent | f225daf883e0c7eed51bec7fadc897fa6a0a2418 [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 Change-Id: I49f98d8c7aa4765672cf0a3860f89cfdd1ed1861