am 2bb47f3b: Merge "fix NPE in dispatchKeyEvents" into honeycomb-mr1

* commit '2bb47f3b59980effa1fba672fa6e67ad32efea56':
  fix NPE in dispatchKeyEvents