OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30d79b7 8fd6ef0)
am 8fd6ef0f: am 16c4e75e: (-s ours) am ab868eff: Merge "Update javadoc for EXTRA_PROV...
authorRubin Xu <rubinxu@google.com>
Thu, 27 Aug 2015 19:29:04 +0000 (19:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:29:04 +0000 (19:29 +0000)
* commit '8fd6ef0fcfd6ff9464e28808e3140a7a7c5ac334':


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