OSDN Git Service

Merge "Rename settings category." into pi-dev am: 24044a78bd
authorDoris Ling <dling@google.com>
Fri, 11 May 2018 23:01:13 +0000 (16:01 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 23:01:13 +0000 (16:01 -0700)
am: ba5b6dd1ed

Change-Id: Icc2ba94b64fbf09c4618a91a880ea8da91e49d06


Trivial merge