app_Settings

Go to file

Zoey Chen 7dc9ea1573 [automerger skipped] Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b am: 6003cb977f am: 9988792138 -s ours am: 0872d40a75 -s ours

am skip reason: Change-Id I52af54045872bbf13e64d5d94c8b027ec702abb9 with SHA-1 ea29704e40 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ebbb6f675ec25e6c09f46e874ae1e24da1c8728

2021-03-09 13:06:31 +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 "Change ScrollView to NestedScrollView for wifi_dialog" into sc-dev am: 3dacd0209c

2021-03-09 08:08:25 +00:00

src/com/android/settings

Merge "Prevent app bar title from drawing twice" into sc-dev am: 50129cc4db