| commit | 8aa75482bd2c8a21338bc16cac917915c4d6c3b6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Mar 07 10:46:51 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 07 10:46:51 2024 +0000 |
| tree | b9d2e6bb6375c50205050e36055a5995e6dbb0a8 | |
| parent | be6f898b8d3b5fa1e506250fce7578bd8f5a6a5b [diff] | |
| parent | a9181cc975fe7a40b22d859c20b60f95e4e697d2 [diff] |
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: d49c898226 -s ours am: a9181cc975 -s ours am skip reason: Merged-In Icf0a411fd16a3c2ee95bcc1949b2d6dc489f0645 with SHA-1 3d8da95b8f is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/2990881 Change-Id: I139a9fef2643fa413e592549afea3335fcaa3096 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 *; -}