am 1f26ea13: am 561a434b: Merge "Fix emulator trackball." into honeycomb

* commit '1f26ea1306a018a0d0eac2295a5ca235b9475d86':
  Fix emulator trackball.