app_Settings

Go to file

Automerger Merge Worker 7cebb74e17 [automerger skipped] Merge changes from topic "am-4d4933939782434894ecfea9a8939979" into tm-d1-dev-plus-aosp am: 9ffd7ecd8f -s ours am: dfbaf8a22a -s ours

am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 0167a4d8a6 is already in history

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

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

2022-05-23 15:41:13 +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

Import translations. DO NOT MERGE ANYWHERE

2022-05-21 09:20:58 -07:00

src/com/android/settings

Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6 am: 38f8c61722 am: fe16309442 am: 4b8ffacaf6