tree db4a55f0d12619311c2b7ad1a403d347f9d9a075
parent d28adb48291e8350b262498ba537990daa878f5b
parent fb03aa36a4790ca0ff5e11a56903507089278390
author Dianne Hackborn <hackbod@google.com> 1437172414 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437172414 +0000

am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev

* commit 'fb03aa36a4790ca0ff5e11a56903507089278390':
  Work on issue #22556778: Starting under voice control not allowed