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