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)
tree: f131f449d1316816f9fb2411882e310e1c6f955d
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE