| commit | d3d5fe189fd47ce130b07016da258fe30e446971 | [log] [tgz] |
|---|---|---|
| author | Luke Huang <huangluke@google.com> | Wed Sep 29 04:10:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 29 04:10:28 2021 +0000 |
| tree | cb71ef5294ab291ea2cc2ce4745ccb7b296eb828 | |
| parent | a5208a6aa2d0a014cecae8a8325468ee1cc58a18 [diff] | |
| parent | 7f2cc5395fb76fbc162784ca250e4467c5b03dee [diff] |
[automerger skipped] Merge "Modify Nsd{Service,Manager}Test to conform to its change" am: 38f82199ab -s ours am: 7f2cc5395f -s ours
am skip reason: Merged-In I3cf658498bef5755dcb01127a94fff913b6e6298 with SHA-1 952a55c62d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764165
Change-Id: I502cb067ae4cef5ae5e7de838a88d1522401c5eb