[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3644011c2a -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/28329650
Change-Id: I95177875dc7e39284d916143ac22a5ef534def7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/OWNERS b/OWNERS
index 14bb338..76afb8b 100644
--- a/OWNERS
+++ b/OWNERS
@@ -5,5 +5,6 @@
alexstetson@google.com # OWNER for Car Settings related code
# Mobile Settings
-stanleytfwang@google.com
chiujason@google.com
+cipson@google.com
+dswliu@google.com
diff --git a/proguard.cfg b/proguard.cfg
index 4ff3790..222c182 100644
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -24,9 +24,3 @@
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet, int);
}
-
-# Keep annotated classes or class members.
--keep @androidx.annotation.Keep class *
--keepclassmembers class * {
- @androidx.annotation.Keep *;
-}
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index cd734f8..1ff858f 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="applications_settings" msgid="3446736638853404682">"ஆப்ஸ் தகவல்கள்"</string>
<string name="accessibility_settings_classname" msgid="973410590374198997">"com.android.settings.accessibility.AccessibilitySettings"</string>
- <string name="accessibility_settings" msgid="1488998032020612740">"மாற்றுத்திறன் வசதி"</string>
+ <string name="accessibility_settings" msgid="1488998032020612740">"அணுகல்தன்மை"</string>
<string name="physical_keyboard_title" msgid="3955072245281785000">"கீபோர்டு"</string>
<string name="add_virtual_keyboard" msgid="542703692821933851">"கீபோர்டுகளை நிர்வகியுங்கள்"</string>
<string name="app_name_settings_intelligence" msgid="8701735500346011661">"Settings Suggestions"</string>