app_Settings

Go to file

SongFerngWang 351a28418c [automerger skipped] Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545 am: 959454f32a -s ours

am skip reason: Change-Id Ib31e23b81bdbd3b5336b45fc73994f40d021718b with SHA-1 d4a25fd13a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87e7116e1731b417e605330d2ddf5a5f1b594862

2021-03-04 14:48:16 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

res

Merge "Bold text string update" into sc-dev

2021-03-03 22:31:17 +00:00

src/com/android/settings

Merge "Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM" notification will pop up." into sc-dev