Guojing Yuan 8d30101228 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours am: 0d8ed82e9c -s ours am: 65885fd60d -s ours ...

am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883

Change-Id: Ica446b5e5743470995aac5c13a991b02611478b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2024-10-15 00:17:02 +00:00

aconfig

Revert^2 "[Catalyst] Add settings service"

2024-10-14 18:56:35 +00:00

libs

…

protos

…

res

Merge "[Physical Keyboard] Add main page for Repeat keys" into main

2024-10-14 15:32:38 +00:00

res-export

…

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-09-26 15:21:29 -07:00

src/com/android/settings

Merge "Revert^2 "[Catalyst] Add settings service"" into main

2024-10-14 22:24:36 +00:00

tests

Merge "[Physical Keyboard] Add main page for Repeat keys" into main

2024-10-14 15:32:38 +00:00

.gitignore

…

Android.bp

Revert^2 "[Catalyst] Add settings service"

2024-10-14 18:56:35 +00:00

AndroidManifest.xml

Revert^2 "[Catalyst] Add settings service"

2024-10-14 18:56:35 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Update color-check-baseline.xml

2024-09-23 11:06:20 +08:00

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%