app_Settings

Go to file

Xin Li 87d82ee836 [automerger skipped] Merge ab/7061308 into stage. am: ad3fa60e26 -s ours am: 7c297fa38a -s ours am: 8767313e05 -s ours

am skip reason: Change-Id I35fe00aeeb112d5d9971985619e3ec5095dcdb7b with SHA-1 8e18b5b69d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd88f43aa09a9355f71762f668928822d3d73060

2021-02-23 11:35: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-21 08:50:16 -08:00

res

Remove "Battery optimization" from Special app access page am: 3e31334065

2021-02-23 07:05:48 +00:00

src/com/android/settings

Merge "Add collapsing toolbar to Notification history page" into sc-dev