tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent af23a779841dff3fc38ec44d5e880dd7eae74f54
parent 2ca8c77b803e50ec4daa76ffc64cc27346d508b3
author Winson Chung <winsonc@google.com> 1392411007 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411007 +0000

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 '2ca8c77b803e50ec4daa76ffc64cc27346d508b3':