OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10b9e88 df263ee)
am df263ee8: (-s ours) am 06476508: Merge "Resolve based on the correct user\'s defau...
authorChristopher Tate <ctate@google.com>
Thu, 27 Aug 2015 07:56:40 +0000 (07:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:56:40 +0000 (07:56 +0000)
* commit 'df263ee885cf667539f497da957f558268298b29':


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