tree a32770fa58ef2cfb7a4bfb3913f008154689c764
parent de6485b8ea3cb33f94ba93d6ae2f2f50005ec856
parent 2b1b458f1ab17943e8679e9840ef15c163097a57
author Jeremy Goldman <goldmanj@google.com> 1608210981 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608210981 +0000

Merge "Owners updates" am: 59465ee9d3 am: 2b1b458f1a

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I308590ad0678932d17660264de8f7a81918bd371