commit | 0a5a1d4ca6c52dbe5f8004aa1dacea6bd70ec25c | [log] [tgz] |
---|---|---|
author | Chris Poultney <poultney@google.com> | Tue Aug 15 18:07:15 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 15 18:07:15 2023 +0000 |
tree | afc9b7c265071ceda206902a3f6fd5b8d0f83e05 | |
parent | 0253617901e194a8d39707d3fe12f5986660f470 [diff] | |
parent | cca5353b726196cc30d0909cf0c67c7646b6c982 [diff] |
Merge "Make ThemePicker override any other AOSP picker" into main am: 09461d20e3 am: 98be76a984 am: cca5353b72 Original change: https://android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/2706335 Change-Id: Ie0f4a538688f4981f7eda8a2469b1c5c821fa23c 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"], }