| commit | d4563c6c644498054935a95576ebed514de05ae8 | [log] [tgz] |
|---|---|---|
| author | Luke Huang <huangluke@google.com> | Wed Sep 29 04:26:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 29 04:26:15 2021 +0000 |
| tree | cb71ef5294ab291ea2cc2ce4745ccb7b296eb828 | |
| parent | 6bff2672089caeea70071895ea6b2974f27a2336 [diff] | |
| parent | d3d5fe189fd47ce130b07016da258fe30e446971 [diff] |
[automerger skipped] Merge "Modify Nsd{Service,Manager}Test to conform to its change" am: 38f82199ab -s ours am: 7f2cc5395f -s ours am: d3d5fe189f -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: Iae62ee090c4b1fe8cd997d6113d10a315108cb44