tree c238e75d6a0ba31e1042812b8e847b1003420654
parent ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f
parent 75370e74629b4938c4472d6001eebf5e305dbc55
author Bjorn Bringert <bringert@android.com> 1273228831 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273228831 -0700

am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo

Merge commit '75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp

* commit '75370e74629b4938c4472d6001eebf5e305dbc55':
  Fixing: RecognitionService logcat spam "cancel called..."