Merge changes I72f810a7,I2bd23f62 am: 4f2bc9a73a am: 1799c950be

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

Change-Id: I59183dde35bc10f666d0be71ec60aa5f3e6d82ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thiébaud Weksteen
2022-11-03 00:05:53 +00:00
committed by Automerger Merge Worker

View File

@@ -70,3 +70,7 @@ per-file Vintf* = file:/platform/system/libvintf:/OWNERS
# Tracing
per-file Trace.java = file:/TRACE_OWNERS
# PermissionEnforcer
per-file PermissionEnforcer.java = tweek@google.com, brufino@google.com
per-file PermissionEnforcer.java = file:/core/java/android/permission/OWNERS