am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

* commit 'd4e00d2b9d29e62b1ad989afb1fe2bfe3b519891':
  Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
This commit is contained in:
Griff Hazen
2015-05-21 22:58:25 +00:00
committed by Android Git Automerger

Diff Content Not Available