app_Settings

Go to file

Treehugger Robot 62fc8f68cd [automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075fa3 am: c4f1bd9675 -s ours am: 2b35467feb -s ours am: 86b03a2578 -s ours

am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 2c74864579 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63295ad558fe195ce466eb16d444ad8f5ee3a25d

2021-03-05 05:37: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 changes from topic "jr_device" into sc-dev am: dd6255a653

2021-03-05 04:50:43 +00:00

src/com/android/settings

Merge "[Provider Model] Fix preference summary not update." into sc-dev am: 1db2d1a25b