OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bfc1d77
89f58e1
)
Merge "Multi-user and WallpaperColors" into oc-dr1-dev am: e09e5ef21b
author
Lucas Dupin
<dupin@google.com>
Thu, 3 Aug 2017 23:10:23 +0000
(23:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 3 Aug 2017 23:10:23 +0000
(23:10 +0000)
am:
89f58e156e
-s ours
Change-Id: I455ae6d0552232647409482479bae5a41189faa9
Trivial merge