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:
d6ab173
03c6030
)
Merge "Copy layout file of preference category from Settings."
author
Malcolm Chen
<refuhoo@google.com>
Tue, 24 Oct 2017 22:32:30 +0000
(22:32 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 24 Oct 2017 22:32:30 +0000
(22:32 +0000)
am:
03c6030ce9
-s ours
Change-Id: Ibacd6e572b31105fe3afe1a904c15ed1d610fc41
Trivial merge