app_Settings

Go to file

Lin Yuan 8c2da28b35 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d am: 4daf65ea3b -s ours am: 9d3371ee23 -s ours am: aeab9be2c3 -s ours am: c24add0997 -s ours am: a4609cf869 -s ours am: 2667882654 -s ours am: e7943d5edc -s ours am: 5390d998be -s ours am: c39beae5d0 -s ours am: b93146c5c6 -s ours

am skip reason: subject contains skip directive

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

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

2022-06-02 23:41:15 +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