tree 99617b92d80919f56c291a02a46429fb00cef50c
parent 33069f40e5ba5a8c036671a67668b6bdfe6eb3a9
parent 6c5e9fb4c4215f76a8a1fd8d72eee1154deb1039
author Sandeep Siddhartha <sansid@google.com> 1378945375 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378945375 -0700

am 6c5e9fb4: am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev

* commit '6c5e9fb4c4215f76a8a1fd8d72eee1154deb1039':
  Remove HotwordRecognition APIs