| commit | a93dbae4719c02279e9d519bd6f4436b0a89b214 | [log] [tgz] |
|---|---|---|
| author | Cole Faust <colefaust@google.com> | Tue Nov 07 22:40:58 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 07 22:40:58 2023 +0000 |
| tree | 63cc0290aa92448e58181753a60bc97bb86fdb39 | |
| parent | 086f868816a3b4d186c3fb9b284395b81797de8d [diff] | |
| parent | f85e863d75bc13926d051c3ea3b325c3f5f251dc [diff] |
Merge "Only allow .scl files to load other .scl files" into main am: 7c8607715d am: f85e863d75 Original change: https://android-review.googlesource.com/c/platform/build/+/2820037 Change-Id: I5da2a5e977e8a46fada134d061fd909728a67250 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk index a4c3a91..f72f2df 100644 --- a/target/product/aosp_product.mk +++ b/target/product/aosp_product.mk
@@ -33,6 +33,7 @@ messaging \ PhotoTable \ preinstalled-packages-platform-aosp-product.xml \ + ThemePicker \ WallpaperPicker \ # Telephony:
diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk index 00b62bc..b2064fa 100644 --- a/target/product/handheld_system.mk +++ b/target/product/handheld_system.mk
@@ -45,6 +45,7 @@ CaptivePortalLogin \ CertInstaller \ CredentialManager \ + DeviceAsWebcam \ DocumentsUI \ DownloadProviderUi \ EasterEgg \