app_Settings

Go to file

Bill Yi a4d9b83149 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours am: 4b073cf421 -s ours am: d700cfe212 -s ours

am skip reason: subject contains skip directive

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

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

2022-04-14 18:19:26 +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 "Add hyphenation to customize button text." into tm-dev

2022-04-14 17:39:13 +00:00

src/com/android/settings

Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4