automerge: afca061
* commit 'afca06105c1344dade61ec5812bf605b11de0f1c':
Fix mangled javadoc for setPermittedInputMethods.
automerge: afca061
* commit 'afca06105c1344dade61ec5812bf605b11de0f1c':
Fix mangled javadoc for setPermittedInputMethods.