| commit | 82bc8c451132353b9f2a269c0387e705f79fdc2d | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 22 18:36:26 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 18:36:26 2016 +0000 |
| tree | 6c0cf42e31a09cab675024ff2ae44cadf791ecb3 | |
| parent | d6e7dcbb64f548f121955b471a3084fd2f20dc6a [diff] | |
| parent | a9c1e43d89d7afc587b620cf7c01d94c1722ad2f [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 Change-Id: I4d35b92457c636f413ae03a992f71844028dfa90