tree 3317f1f3621e14b259657cf2122ad6e1f3027f2a
parent 8125047183ae9c6fcd021d701d4f108a87febe49
parent 90fc97dfccaff5fe4832cbb58cee187efbf9dcfd
author Fan Zhang <zhfan@google.com> 1562678059 -0700
committer android-build-merger <android-build-merger@google.com> 1562678059 -0700

Merge "Update Settingslib owners"
am: 90fc97dfcc

Change-Id: Id8196146c744a273331c2c1a6c39fe02274d54cd