am fd47c5ee: (-s ours) am f0210c36: Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1

* commit 'fd47c5eea2a4393b5c9897bb80db721809146aaf':
  Joystick tweaks. (DO NOT MERGE)