[automerger skipped] Merge "resolve merge conflicts of a13fc7f314 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -s ours

Browse Source

am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea7448 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13464421

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I409002a313787764b16cb23080c38e9273104638

...

This commit is contained in:

TreeHugger Robot

2021-02-08 17:23:08 +00:00

committed by Automerger Merge Worker

parent 24a1d2c990 6d4ff2e0f0

commit 2fffbcb7df

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