[automerger skipped] Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev am: fcc69726ed -s ours

Browse Source

am skip reason: Merged-In I4c485a5d8fb4d6f52d82633a579bce4feb5c6375 with SHA-1 18d636a05e is already in history

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

Change-Id: I32b0cdfdf3dcad796a0ccf4c4e237e326e878c94

...

This commit is contained in:

Luke Huang

2021-06-15 04:59:23 +00:00

committed by Automerger Merge Worker

parent 2052e3076d fcc69726ed

commit a040a3d568

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