[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e135f6e5f1 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/28775987
Change-Id: I4b669b049a1044dff88d6a9dbe240c5a362492e6
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 *;
-}