| commit | a040a3d5680351a791333bc0f63b8006f93db486 | [log] [tgz] |
|---|---|---|
| author | Luke Huang <huangluke@google.com> | Tue Jun 15 04:59:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 15 04:59:23 2021 +0000 |
| tree | c09855fe2b2141884af88d686fa24f34ca57f617 | |
| parent | 2052e3076dce3fd32cb8fe3a8e2e2af64d37d841 [diff] | |
| parent | fcc69726ed2552f6a07956b4180a681c608b01f6 [diff] |
[automerger skipped] Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev am: fcc69726ed -s ours 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