[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5 -s ours am: ee06524dbe -s ours

Browse Source

am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b33cb519a95d18ba7d64d90db3b10e3a9afe211

...

This commit is contained in:

Xin Li

2020-12-10 03:46:48 +00:00

committed by Automerger Merge Worker

parent 317aa9e772 ee06524dbe

commit fb437d54d9

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