app_Settings

Go to file

Treehugger Robot f836f55043 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6 am: 3c039ca648 -s ours am: 2df32f537f -s ours am: 4e7bbcce82 -s ours am: 4ad9d18da2 -s ours

am skip reason: subject contains skip directive

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

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

2023-07-07 01:02:53 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

Add a config to hide the 3G option at preferred network mode UI

2023-02-08 07:41:13 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2023-06-22 22:06:04 -07:00

src/com/android/settings

Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev