am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
automerge: afca061

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