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

Browse Source

am skip reason: Change-Id I4fa07b3ba54d994e87a5fa67e9f4e5a0d4d4b28c with SHA-1 93c88fecf0 is in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1520839

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib32296dffb857ae08f59339c07eafd9e7947d8f1

...

This commit is contained in:

Xin Li

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

committed by Automerger Merge Worker

parent 93c88fecf0 223d9273bb

commit ab5332ac88

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