| commit | a1cc0ff88436a91bce8da2adfb866377c2a9bfb4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Jun 06 21:36:30 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 06 21:36:30 2024 +0000 |
| tree | 5b606917a4cbcdd5e23b1d393096d9094979583d | |
| parent | 20b87a24a5beee3f553475afbda0ec9d597d9996 [diff] | |
| parent | 890f20c9de4a9cbd1f471cea8aa761456bc729fd [diff] |
[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 890f20c9de -s ours am skip reason: Merged-In I3a91fa581e5b3509d21a86200243e2d51c8b0953 with SHA-1 20b87a24a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/27555171 Change-Id: I7b6d4ea25cabd308823be30d6766c81fc8aaa8c3 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 *; -}