tree 977d431c3496daf9314f772d4505613600cb0ce4
parent 4b591a64d52a1d8444f961d65b034777affbdfcb
parent d2632a83668001065e6de9d38cc7166f309a2ca3
author Griff Hazen <griff@google.com> 1432326180 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432326180 +0000

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

* commit 'd2632a83668001065e6de9d38cc7166f309a2ca3':