tree bad32bc980f184fdb97b524d58d273c661b9ee90
parent 85525040dd002ec43ad776e3f43c7db6911ef0e2
parent 09822ec619c2edb22b6423702c892c9d9d94718a
author Chris Thornton <thorntonc@google.com> 1444879303 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444879303 +0000

am 09822ec6: am 11543a1b: am ea5ad487: am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev

* commit '09822ec619c2edb22b6423702c892c9d9d94718a':
  Don't call StopRecognition when recognition was aborted.