tree 5cb08fbb70bc763fa3df05f7008268dc1db58495
parent 658b686838f3b4ffdc7f371f9f89d7e022b1b02a
parent fbad902aad433f4eaa82192019fef1dcaba26d47
author Cedric Ho <cedricho@google.com> 1430329414 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430329414 +0000

am fbad902a: am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev

* commit 'fbad902aad433f4eaa82192019fef1dcaba26d47':
  Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.