am 1311455f: am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2

* commit '1311455f3ee8cbd2b2b83ec2d98e95e1da108743':
  Button state should reflect actual buttons. (DO NOT MERGE)