| commit | 5d7ca78437bb974ecf3f40da17bedaeffbb4948d | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 22 18:56:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 18:56:52 2016 +0000 |
| tree | ae2f8bf640c4b66b7e645e9462ab34037d790e8b | |
| parent | 015c71c8fdd385a63bdda9c07c0be56fcdda9db6 [diff] | |
| parent | f49ac6ef61935ad636305dd1f3a3d4964b7c4f61 [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 Change-Id: Ia5850378f26dc69b9114ddff2f342d0b3cebfce6