app_Settings

Go to file

Weng Su fb6947cdf7 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 66be7c55a2 -s ours am: 3fb9083a66 -s ours

am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66ef1a439a271ce64d7900fd4aa73a4d9fa37e42

2021-03-05 06:36:38 +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:47:47 +00:00

src/com/android/settings

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