tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent e33ff259af2e91080de5e30868f440bd987fc06f
parent e4b1fd58c335f5b27318baf2128fe0375c4fccde
author Winson Chung <winsonc@google.com> 1392410131 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410131 +0000

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 'e4b1fd58c335f5b27318baf2128fe0375c4fccde':