app_Settings

Go to file

Lin Yuan def1db89c1 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a am: d78ed7aa73 -s ours am: 36b5a2c8d3 -s ours am: 9a8b9356d1 -s ours am: 98c2b7b85d -s ours am: 5912455bf0 -s ours am: 88d116c4f7 -s ours am: 24e9395014 -s ours am: 9ed61a56fb -s ours

am skip reason: subject contains skip directive

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

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

2022-06-02 22:51:43 +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