| commit | 4df4f382659c1b79af7d9210a029210c789d6e0a | [log] [tgz] |
|---|---|---|
| author | Cedric Ho <cedricho@google.com> | Tue Apr 28 14:51:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 28 14:51:59 2015 +0000 |
| tree | 979ca8593449c1a47968393018f3b702c61eb692 | |
| parent | 9be930c101f099edd439f72268ba41ba5ade4453 [diff] | |
| parent | 452304f7195a782f5448ecf8bda7be11d5536982 [diff] |
am 452304f7: am 25d12e3f: Merge "resolved conflicts for merge of 0af3af03 to mnc-dev" into mnc-dev * commit '452304f7195a782f5448ecf8bda7be11d5536982': Enable VoiceInteractionService on watch.