app_Settings

Go to file

Bill Yi 3e01c01021 [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73 -s ours

am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807 is already in history

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

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

2023-07-12 14:10:24 +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

Merge "Import translations. DO NOT MERGE ANYWHERE"

2023-06-08 19:37:07 +00:00

src/com/android/settings

Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97