| commit | 8f585128f5ce28219f4f56bef27caac139bbfbd7 | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Thu May 21 22:58:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 21 22:58:25 2015 +0000 |
| tree | 8e039977812c633bbfe7c2992bb6a999ea75fc97 | |
| parent | dc085ed27a70296d4b4d30ba414b39b6f5a8eb9f [diff] | |
| parent | d4e00d2b9d29e62b1ad989afb1fe2bfe3b519891 [diff] |
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