tree 7d9355ac3147535eddb8951271b712fdc8a1b464
parent d509c56d4520e9d6749f53e7d44abccfb05634c6
parent 7bba64935214555f51adce48020827d0ad09ada9
author Dianne Hackborn <hackbod@google.com> 1504204284 +0000
committer android-build-merger <android-build-merger@google.com> 1504204284 +0000

Merge "Fix issue #65055576: VoiceInteractionManagerService sets..." into oc-mr1-dev am: 9d484f015f
am: 7bba649352

Change-Id: I8c97bc1d29dcff6c2a4cafe0ff649d725b1f2266