[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 13850821b2 -s ours am: f0ff69872a -s ours

Browse Source

am skip reason: Change-Id I16d3f4210df3d1e2d59a5785422ad732546935e4 with SHA-1 896cb8d6c6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6829ba0da42969f09d44e1401b2239549810abbb

...

This commit is contained in:

Xin Li

2020-12-10 03:46:48 +00:00

committed by Automerger Merge Worker

parent b5ac71e8fb f0ff69872a

commit 660bca93da

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