app_Settings

Go to file

Lin Yuan 0acf211c77 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6 am: 95d21bc12f -s ours am: 18c00007b7 -s ours am: 148b2d99ba -s ours am: fd627f9c1d -s ours am: 729c5d0487 -s ours am: d299b72b26 -s ours am: baafc1c083 -s ours am: a14e842cce -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: If35aec45d569d97364a8b7f6ea7ee2e6436cc487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-06-02 22:50:55 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[Settings] Code refactor - NetworkModePreference

2022-03-19 10:46:06 +08: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