commit 5da70a051343f94e42de1b34dc600fef00902d5e
author Xin Li <delphij@google.com> Wed Oct 06 22:53:57 2021 +0000
committer Xin Li <delphij@google.com> Wed Oct 06 22:53:57 2021 +0000
tree 143388bce5f5d402d80feb4847349f3845b78883
parent f86d9b51bb44798a07c1d53f53338440a3e6b154
parent b9f6e60e0d6a073ca11af2923c2244a74f059198

Merge Android 12

Bug: 202323961
Merged-In: I565346d42353a9cc63ef73242068f001df661d1f
Change-Id: I9c5ede88d6ea65054a3b74e09289412b83b64d9c

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 68f52f0..2867eeb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,6 +22,7 @@
         android:allowBackup="false"
         android:label="@string/app_name"
         android:supportsRtl="true"
+        android:exported="true"
         android:theme="@android:style/Theme.DeviceDefault.Settings">
         <activity android:name=".SafetyAndRegulatoryInfoActivity">
             <intent-filter>

res/values-or/strings.xml

diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index a714b66..0af39ae 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="2296187190802005745">"ସୁରକ୍ଷା ଓ ନିୟାମକ ମାନୁଆଲ୍"</string>
+    <string name="app_name" msgid="2296187190802005745">"ସୁରକ୍ଷା ଓ ନିୟାମକ ପୁସ୍ତିକା"</string>
 </resources>