tree f09362ea7a3268a310b99c42ffb9eda46ae18b28
parent 61f560d92ab4b11a61beeb8df97b9952027e08e4
parent 5841efa6121fb40dd7c1a6a432a899b894fa5c6d
author Winson Chung <winsonc@google.com> 1380590002 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380590003 +0000

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