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

Browse Source

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

...

This commit is contained in:

Hugh Chen

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

committed by Automerger Merge Worker

parent 50ab9ab26a 18c06480b0

commit aaf2ad7738

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