am a1ea69c9: am cad47af9: Merge "Fix (Qwerty|MultiTap)KeyListenerTest Tests" into froyo

* commit 'a1ea69c9ce9766281e8d0ec43c482937fafdd599':
  Fix (Qwerty|MultiTap)KeyListenerTest Tests