tree 10da860fcff71886af91d082e31f0e1917926848
parent eb6342e4c83b9faa8d02cb316b09c62704f0740e
parent 935d37eff8474e41eece5e2a75c378e53283bcb1
author Winson Chung <winsonc@google.com> 1414566106 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566106 +0000

am 935d37ef: 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 '935d37eff8474e41eece5e2a75c378e53283bcb1':