[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 201f2cf86d -s ours am: 54ec331515 -s ours

Browse Source

am skip reason: Change-Id Ib81ba3288a986546bc570c3759c55d026add591a with SHA-1 3cfbcbee16 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic11fc264d783e729729854a5f7f7b03d38d43e3e

...

This commit is contained in:

Xin Li

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

committed by Automerger Merge Worker

parent 353274f15d 54ec331515

commit 6b2e6ab2f5

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