commit | a9c1e43d89d7afc587b620cf7c01d94c1722ad2f | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Mon Aug 22 18:32:20 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 18:32:20 2016 +0000 |
tree | 6c0cf42e31a09cab675024ff2ae44cadf791ecb3 | |
parent | 081388d87586909a439b3e0a9c5e8edb76d19842 [diff] | |
parent | 91ec9a6fd37ef12ab3b37ebdec56e798d85a6797 [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 Change-Id: I075a2bf350184ade7a96cb1e4846d9459695a630