| commit | 3f692884be6a1426511275120635c43f2a52aa69 | [log] [tgz] |
|---|---|---|
| author | Luke Huang <huangluke@google.com> | Tue Jun 15 05:03:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 15 05:03:48 2021 +0000 |
| tree | ba449a1fb80c2a043330992d0032460ac8bf8f9d | |
| parent | 2eaba3401a8487224beb450f7014b0c233412569 [diff] | |
| parent | 7e773cd7b73db86b1a0accc47df876a886a8f6b8 [diff] |
[automerger skipped] Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev am: fcc69726ed am: 7e773cd7b7 -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: I6a33843f95b2de27cf4dcd31e02873330d76b763