[automerger skipped] Merge 10952656 am: 26ba2b8247 -s ours am: 9391249b9e -s ours
am skip reason: Merged-In Idcbaa090acede3f76d10ae93a29c035285e1f9f4 with SHA-1 1469be0c68 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/25089436
Change-Id: I6995e7876c686e73ca60bb44a50150666714bbb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/OWNERS b/OWNERS
index 791abb4..5232bc3 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
-include platform/system/sepolicy:/OWNERS
+include device/google/gs-common:/sepolicy/OWNERS
-rurumihong@google.com
+adamshih@google.com
+
diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index a364f18..377d3a2 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -1,5 +1 @@
-crash_dump vendor_slog_file dir b/238837168
-hal_camera_default boot_status_prop file b/275002086
-hal_camera_default edgetpu_app_service service_manager b/275002086
-kernel vendor_charger_debugfs dir b/239887174
-kernel vendor_regmap_debugfs dir b/238143398
+kernel vendor_charger_debugfs dir b/305600791
diff --git a/tracking_denials/dumpstate.te b/tracking_denials/dumpstate.te
deleted file mode 100644
index 13af0d5..0000000
--- a/tracking_denials/dumpstate.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# b/277155327
-dontaudit dumpstate default_android_service:service_manager { find };
diff --git a/tracking_denials/grilservice_app.te b/tracking_denials/grilservice_app.te
deleted file mode 100644
index cf98a89..0000000
--- a/tracking_denials/grilservice_app.te
+++ /dev/null
@@ -1 +0,0 @@
-dontaudit grilservice_app hal_bluetooth_default:binder call;
diff --git a/tracking_denials/hal_vibrator_default.te b/tracking_denials/hal_vibrator_default.te
deleted file mode 100644
index ece806d..0000000
--- a/tracking_denials/hal_vibrator_default.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# b/277300226
-dontaudit hal_vibrator_default default_android_service:service_manager { find };
