tree 1ca3bb6c4db84e14bfc262fa55d3d5c4a573a27e
parent 9c26cebc887c9b5e2211702a25d4c60481899013
parent 0a3e11fe428b2d49cecaaf1199ceed36245c1d6f
author Dianne Hackborn <hackbod@google.com> 1416252719 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416252719 +0000

am 0a3e11fe: am 76919595: Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev

* commit '0a3e11fe428b2d49cecaaf1199ceed36245c1d6f':
  Issue #17551667: Voice interaction service should be disabled...