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

* commit '5f9d36d5b987dad1f8f13e2a392f5320cbc6053f':