tree 435ea273f8eb1d3e390ed4bef94d30f00e55843c
parent 21d7726c677559ac879caa47d9c1668c715df2ef
parent 97eae7f9cc5c6d66ee842b8204b62ebc2fa2595e
author Jeff Sharkey <jsharkey@google.com> 1610731418 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610731418 +0000

Merge "Add owners for locksettings related files" am: e768557623 am: fec42d6f3f am: 97eae7f9cc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1551936

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I883f057b43b0fc206626a309ec8f522c84cb9bbf