| commit | 9f56fe8374c22a6c39f3d95713404ac29b78276a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Jun 18 05:56:06 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 18 05:56:06 2024 +0000 |
| tree | bf74ed791154f15ab3a00acf3bacbf2ed0d015af | |
| parent | b3c6e7e47a0f1ea2bc93179430b755da1c3d558d [diff] | |
| parent | 44211a699c76cc7ceab0972953acdb9b3e910334 [diff] |
[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 88aa37e851 -s ours am: 44211a699c -s ours am skip reason: Merged-In I9b72596acfebde0f34ba59bc91feea724f972eff with SHA-1 72bae9af17 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/3132280 Change-Id: I22b2717d118b342a44f1763595481dc103dd07c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.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 *; -}