am 00afa11c: am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2

* commit '00afa11c1565da7ad6721db08a4da7c2ec1eacc0':
  Tap timeout removed on paste. Relying on position only.