[automerger skipped] [resolved conflict] Add test case to test normalize am: f444e9d182 am: fc719b474a -s ours

Browse Source

am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 f444e9d182 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16251687

Change-Id: I13b7568fd53d16ad450e73d66664d6ef190b8a9e

...

This commit is contained in:

Les Lee

2021-11-15 15:39:27 +00:00

committed by Automerger Merge Worker

parent e75effbfe6 fc719b474a

commit d6f2ce6fed

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