tree 3aacfb0d6f5b3f615ed287bc12567a503d08c3f4
parent 7ebdcbdb6f3314ffa3f3817ed62251b8973179fa
parent 014085a8727d7e10a4d39cba4a6d27826b66bc00
author Charles Chen <clchen@google.com> 1262146270 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1262146270 -0800

am 014085a8: am 4bc95d19: Merge change Iab089078 into eclair-mr2

Merge commit '014085a8727d7e10a4d39cba4a6d27826b66bc00'

* commit '014085a8727d7e10a4d39cba4a6d27826b66bc00':
  Fix for a race condition that can occur if an utterance