OSDN Git Service

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

Change-Id: I24636a030808fe4125c5ac0eef3d41233ee3bb17


Trivial merge