OSDN Git Service

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

Change-Id: I257ed814d67116c6a476a207ad7dbd8089533bda


Trivial merge