tree 50637044601e26f596b598902f36072c6e83474b
parent c690dca2f741ff5f082059ed951a380525eedf57
parent f099eb0bf4c0fdee5c4708d48ce0134fbf0d1249
author Winson Chung <winsonc@google.com> 1380590191 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380590191 -0700

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

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