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

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