commit 7abb52e9b92b88e299d9c75a68abafc1ef65282c
author Karsten Tausche <karsten@fairphone.com> Wed Mar 15 16:55:39 2023 +0100
committer Karsten Tausche <karsten@fairphone.com> Wed Mar 15 16:55:39 2023 +0100
tree cf1d77a099df124f08e8fa85f9b140d8d69fc00d
parent 77000d470301c179e1037ad99c05426cef447e1d
parent 7399b4b973e27ed6da67be71e1ce5aeb9553b993

Merge tag 'android-13.0.0_r32' into int/13/fp3

Android 13.0.0 release 32

* tag 'android-13.0.0_r32':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

Change-Id: I076ddcb02fa90d5a060a708377cf7c97f969887e

Android.bp

diff --git a/Android.bp b/Android.bp
index 9ad6c84..331bf30 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,7 +53,7 @@
      // which consists of CellBroadcastServiceModule
      overrides: ["com.android.cellbroadcast"],
      manifest: "AndroidManifest_Platform.xml",
-     required: ["privapp_allowlist_com.android.cellbroadcastservice.xml"],
+     required: ["platform_privapp_allowlist_com.android.cellbroadcastservice.xml"],
 }
 
 genrule {