[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 2bbb6c9e30 -s ours

Browse Source

am skip reason: Change-Id I7b50510b61129704f71ab4d9c474d74f4739aef0 with SHA-1 863a120b51 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1521197

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c55466fc40c06aab98f2c953edcc4a4f13ee2b7

...

This commit is contained in:

Xin Li

2020-12-10 03:05:23 +00:00

committed by Automerger Merge Worker

parent 863a120b51 2bbb6c9e30

commit 505f0db2a6

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