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