| commit | d2632a83668001065e6de9d38cc7166f309a2ca3 | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Fri May 22 20:07:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 22 20:07:11 2015 +0000 |
| tree | eb5f34267c535cf979f66ae22f9069c386377a93 | |
| parent | cc6029b82bb83faf237e3f718a5479db0c53d839 [diff] | |
| parent | 8f585128f5ce28219f4f56bef27caac139bbfbd7 [diff] |
am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev * commit '8f585128f5ce28219f4f56bef27caac139bbfbd7':