app_Settings

Go to file

Xin Li d02caacd56 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355 -s ours am: 5c022ddef7 -s ours am: 75f92deb34 -s ours

am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489 is already in history

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

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

2022-06-30 00:02:31 +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-23 11:24:26 +00:00

src/com/android/settings

Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: e30a71787e