OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c71d0cc b6332fd)
am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInp...
authorKenny Guy <kennyguy@google.com>
Fri, 6 Feb 2015 16:37:11 +0000 (16:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Feb 2015 16:37:11 +0000 (16:37 +0000)
* commit 'b6332fd21a97b846015693684cee9e2af3381f0a':
  Fix mangled javadoc for setPermittedInputMethods.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help