app_Settings

Go to file

TreeHugger Robot 95e5ab5b1c [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: 0d290a85c7 -s ours am: 82d0f7a11b -s ours am: df6133e2b9 -s ours

am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d55b366bb0d2383e5c9730cb731f9fd2c8d54e2

2021-03-05 05:37:07 +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