tree 50637044601e26f596b598902f36072c6e83474b
parent 87cbe9354ca41a6df318bd8ebf8aceb3f8f018f9
parent 5a4cb3fa6b5794bc61a7da0990c5145e8e9e47ab
author Winson Chung <winsonc@google.com> 1380590354 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380590354 -0700

am 5a4cb3fa: am f099eb0b: Merge "Using state to update voice button proxy visibility instead of view flags. (Bug 10915381)" into jb-ub-now-indigo-rose

* commit '5a4cb3fa6b5794bc61a7da0990c5145e8e9e47ab':
  Using state to update voice button proxy visibility instead of view flags. (Bug 10915381)