tree 889c9ec18faa34332b86e509df18d254b75e20ff
parent 1836f6b8f3f34ad31acc04f861c380b186e52193
parent 70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1
author Kenny Guy <kennyguy@google.com> 1423237073 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423237073 +0000

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

* commit '70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1':
  Fix mangled javadoc for setPermittedInputMethods.