OSDN Git Service

Merge "Copy layout file of preference category from Settings."
authorMalcolm Chen <refuhoo@google.com>
Tue, 24 Oct 2017 22:32:30 +0000 (22:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Oct 2017 22:32:30 +0000 (22:32 +0000)
commit176b656fb20050976d54244f5a7d9fea916ff197
treebc8ab7fe3c992ae98e76063e3c07c119a49c7524
parentd6ab173f6c1d9b92ab0385a2d88664232152a8fc
parent03c6030ce94662ed008ca6a6447da9fb62d4ea0c
Merge "Copy layout file of preference category from Settings."
am: 03c6030ce9  -s ours

Change-Id: Ibacd6e572b31105fe3afe1a904c15ed1d610fc41