am a97a7b5a: am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1

* commit 'a97a7b5a6efac20a112c1833579a0a2b17bc058e':
  docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537