app_Settings

Go to file

Hugh Chen aaf2ad7738 [automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev am: 18c06480b0 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6e7de3bd526b0419f6fc1513bbc040e44982b0d

2021-01-07 05:18:27 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Card showing mechanism change in homepage

2020-02-14 17:44:11 +08:00

res

Merge "Accessibility settings display category restructure, add text and display fragment for related accessibility services."

2021-01-07 01:28:17 +00:00

src/com/android/settings

Merge "Accessibility settings display category restructure, add text and display fragment for related accessibility services."