commit | 91ec9a6fd37ef12ab3b37ebdec56e798d85a6797 | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Mon Aug 22 18:28:19 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 18:28:19 2016 +0000 |
tree | 83099084c2a5974fc3bba4de46da9f7b4f70bd44 | |
parent | 08eab782094a2451cfcff7f7d49ce6fbbb255e80 [diff] | |
parent | 7fa7052231b770d342192ac6c54ddc5ee6e2e363 [diff] |
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231 -s ours Change-Id: I5dddb4aeffa111dfda64e335d7baf7758a1740ee