[automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours

Browse Source

am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id982e8e6f2931509943c5d8e0f77202d04183c9e

...

This commit is contained in:

Michael Groover

2021-02-09 23:40:02 +00:00

committed by Automerger Merge Worker

parent 2fffbcb7df 8750762ce0

commit ebde0f1f40

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