| commit | 9bfeb24c7f64cb023e8e09ad7cf301becb81a30a | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Fri May 22 22:09:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 22 22:09:26 2015 +0000 |
| tree | ee8aa61835d58fdde762296db10e1a4f93a6dbf4 | |
| parent | 41981389a815dd31c9225640d2565bdf2fa2868e [diff] | |
| parent | f8f6bed200d4ba351bbfd32e8fb9bb18909324be [diff] |
am f8f6bed2: (-s ours) am ed3236e0: (-s ours) 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 'f8f6bed200d4ba351bbfd32e8fb9bb18909324be':