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

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