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

* commit '02c6cad7c49942336ed6a8fe015c0cb4eced0c82':