| commit | 9f554e6d8632a20bbcd15017eb4e203a789809c1 | [log] [tgz] |
|---|---|---|
| author | Luke Huang <huangluke@google.com> | Wed Sep 29 04:10:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 29 04:10:21 2021 +0000 |
| tree | 58353b68518740e667085ad606e9adfd604aa35a | |
| parent | 5d714cf50489917725739563f846440f51a93460 [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: Ia70427ba9cb94672d103091f09d1634902060e6b