tree 0d4d7172e24efa8d361c11ae9cea8df410e5ac38
parent e12cfc23b2399ded0cc4608e47c5ba864fc5ab7d
parent 7d9fdd1e0d980fb9e67fbb96b4c499b1895109f1
author Dianne Hackborn <hackbod@google.com> 1416252723 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416252723 +0000

am 7d9fdd1e: Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev

* commit '7d9fdd1e0d980fb9e67fbb96b4c499b1895109f1':
  Issue #17551667: Voice interaction service should be disabled...