commit | 98be76a984e7366bb3888f9a31b546611a857340 | [log] [tgz] |
---|---|---|
author | Chris Poultney <poultney@google.com> | Tue Aug 15 16:42:21 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 15 16:42:21 2023 +0000 |
tree | 809f6a59ce1766d12dc6d159e44c6b385a4def84 | |
parent | 4264f983ede77a75c6f368391487c49586af9792 [diff] | |
parent | 09461d20e37de46412f294561e5e798984c019fc [diff] |
Merge "Make ThemePicker override any other AOSP picker" into main am: 09461d20e3 Original change: https://android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/2706335 Change-Id: I2ec9b42db80a665d5c02ff2e5d80152e3f45e41c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp index 3694ea0..b7c0d00 100644 --- a/Android.bp +++ b/Android.bp
@@ -118,5 +118,5 @@ platform_apis: true, manifest: "AndroidManifest.xml", additional_manifests: [":WallpaperPicker2_Manifest"], - overrides: ["WallpaperPicker2"], + overrides: ["WallpaperPicker", "WallpaperPicker2"], }