[automerger skipped] Merge changes from topic "nullablecollection" am: 0a5c421c92 am: 43e0944217 am: db20faabe8 -s ours

Browse Source

am skip reason: Change-Id I5ce70d3e622fcdd13d63d47bf483507378a60e16 with SHA-1 c042e7c643 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3cca4dfc5d551377307b4393ca8e2b3aa06318c

...

This commit is contained in:

Adrian Roos

2021-02-04 17:10:01 +00:00

committed by Automerger Merge Worker

parent 6aea75553a db20faabe8

commit c95b4ad078

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