app_Settings

Go to file

Tom Hsu 1a356f2425 [automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 am: 62f6b96b51 -s ours am: fd8531400d -s ours

am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7fe4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec3106b0896f60b5baa9dfb8c77e2ac7743257aa

2021-02-01 19:34:28 +00:00

libs

Update proto for contextual_card_list.

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

protos

Card showing mechanism change in homepage

2020-02-14 17:44:11 +08:00

res

Merge "Tweak the ui based on the Android S design" into sc-dev am: 77382001fa

2021-02-01 14:50:34 +00:00

src/com/android/settings

Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev