OSDN Git Service

Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
authorKenny Guy <kennyguy@google.com>
Fri, 6 Feb 2015 15:22:22 +0000 (15:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Feb 2015 15:22:23 +0000 (15:22 +0000)

Trivial merge