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)
commitba5b6dd1ed445931c26874b4d6f3c014926387d4
treec519326037dff28ff8f385d42f3be95204b0379c
parentb3950b7ccd1c00882f722c5382572068544143dd
parent24044a78bd85fb03213421ac8a79a04ed6d95874
Merge "Rename settings category." into pi-dev
am: 24044a78bd

Change-Id: I257ed814d67116c6a476a207ad7dbd8089533bda