[automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3 am: 3be43ae165 -s ours am: 45c581df53 -s ours

Browse Source

am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d5224 is already in history

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

Change-Id: I664100f166a7dadf818f19c71f0c9cd593a8f757

...

This commit is contained in:

Xin Li

2021-12-21 07:36:38 +00:00

committed by Automerger Merge Worker

parent ae62873812 45c581df53

commit bf2e17f4b9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available