tree 81e3c24cee2105110a731b0bdf57426aeea7a2b1
parent eceae03f6a21b36baddabe4ca5a2c1d9d238240a
parent 8debf21357477083a716275e2a32cb7169d42c47
author Kenny Guy <kennyguy@google.com> 1423236501 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423236501 +0000

am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev

* commit '8debf21357477083a716275e2a32cb7169d42c47':
  Fix mangled javadoc for setPermittedInputMethods.