Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: I91a10a027ae1d1bab87ba89bdbba246d9ca8876b
Change-Id: I6e5666560b20cc3d29ba527dd6711ed4865118b3
This commit is contained in:
Xin Li 2024-03-06 09:29:51 -08:00
commit 2994007654
2 changed files with 7 additions and 6 deletions

5
OWNERS
View file

@ -1,3 +1,4 @@
include platform/system/sepolicy:/OWNERS include device/google/gs-common:/sepolicy/OWNERS
adamshih@google.com
rurumihong@google.com

View file

@ -1,5 +1,5 @@
hal_camera_default boot_status_prop file b/275001805
hal_camera_default edgetpu_app_service service_manager b/275001805 audioserver vendor_file file b/312069156
hal_dumpstate_default modem_stat_data_file dir b/239115418
shell sysfs_touch dir b/264823366
platform_app system_data_file dir b/289358324 platform_app system_data_file dir b/289358324
shell sysfs_touch dir b/264823366
system_app proc_pagetypeinfo file b/312375728