app_Settings

Go to file

Bill Yi 6a5c064925 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours am: 5fb0418563 -s ours am: 55211b61d3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I79c7cbfb2bb03965077db22ba5c0af609d47f34a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-04-22 20:49:46 +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-dev

2022-04-22 06:17:37 +00:00

src/com/android/settings

Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 3ab907b968