| commit | 7f2cc5395fb76fbc162784ca250e4467c5b03dee | [log] [tgz] |
|---|---|---|
| author | Luke Huang <huangluke@google.com> | Wed Sep 29 03:50:49 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 29 03:50:49 2021 +0000 |
| tree | d22cbf0263a5ea4d5e34a5397a7db78844219063 | |
| parent | f405adead7d13b2fec7164356bd534e9ae8487fe [diff] | |
| parent | 38f82199abbfaa84f08bd798f51da77540b9755b [diff] |
[automerger skipped] Merge "Modify Nsd{Service,Manager}Test to conform to its change" am: 38f82199ab -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: Icbe217fcfba27fd186af32d79fb3d61e2a868b7c