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

Browse Source

am skip reason: Change-Id Iec4d1963e626829b696c2047c5979a684119acf7 with SHA-1 18c06480b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b45cbf704ffd1558b681a4835bc628dcc132894

...

This commit is contained in:

Hugh Chen

2021-01-07 18:31:10 +00:00

committed by Automerger Merge Worker

parent 18c06480b0 dc2b694a54

commit 9d153e6331

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