tree cba62d0d64153aa2169651696bc238591341d679
parent ef8cded275daf0d206bd93038fc36ab5262a7a89
parent d94d335ba010d4bac5e780073b73b6f28b267e74
author Winson Chung <winsonc@google.com> 1414085220 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085220 +0000

am d94d335b: am 2ca8c77b: am e4b1fd58: 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 'd94d335ba010d4bac5e780073b73b6f28b267e74':