diff options
| author | Griff Hazen <griff@google.com> | 2015-05-22 01:50:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-22 01:50:57 +0000 |
| commit | cf3591ad60fac149fbe4d3e7e6335fdb9ea63eef (patch) | |
| tree | 8677be221f5501504391207c3d55a383bb93453c /docs/html/sdk/api_diff/18 | |
| parent | c40cd40d90c54b20e490fb25596f0781601e5d6d (diff) | |
| parent | 99fd373cc66e0b4512b6b32c08c453501482a76e (diff) | |
am 99fd373c: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '99fd373cc66e0b4512b6b32c08c453501482a76e':
Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
Diffstat (limited to 'docs/html/sdk/api_diff/18')
0 files changed, 0 insertions, 0 deletions