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

* commit '2a1a1fa626bfc626577730407651d9fca2d375c7':