tree f8dc70894990bdd2f2bc0845b5196aa11dbd734c
parent a18f840082f4b1d8cbe4b9d9fc4bd816357252dc
parent 176b656fb20050976d54244f5a7d9fea916ff197
author Malcolm Chen <refuhoo@google.com> 1508884930 +0000
committer android-build-merger <android-build-merger@google.com> 1508884930 +0000

Merge "Copy layout file of preference category from Settings." am: 03c6030ce9  -s ours
am: 176b656fb2  -s ours

Change-Id: Ib2c4d023f26564833619edf2a4ad8eb28c4a29a6