| commit | 99fd373cc66e0b4512b6b32c08c453501482a76e | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Thu May 21 22:55:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 21 22:55:23 2015 +0000 |
| tree | f00f84c711916320d97d2090bf588d973c23177d | |
| parent | 77420269fe36e693efd8e78d047a90c7d4fbb66b [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