app_Settings

Go to file

Lin Yuan ace0b6b829 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours am: 62d47086be -s ours am: 660132025e -s ours am: 5ad09828dd -s ours

am skip reason: subject contains skip directive

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

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

2022-06-02 21:34:42 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[Settings] Code refactor - NetworkModePreference

2022-03-21 00:18:55 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev

2022-06-02 14:04:06 +00:00

src/com/android/settings

Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35 am: 8d9c7445a8 am: 5e1da1db62