| commit | df92f77c0c9c3ec3d1b211a4acfe10de96597b0b | [log] [tgz] |
|---|---|---|
| author | Luke Huang <huangluke@google.com> | Wed Sep 29 04:40:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 29 04:40:48 2021 +0000 |
| tree | 716edba29df77e0ec5104aa409cc58fefcb2b994 | |
| parent | e605ba59831027749d86fdf535ae9b4ad980da7a [diff] | |
| parent | d4563c6c644498054935a95576ebed514de05ae8 [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: d4563c6c64 -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: I85bcb1f1ce2e5e9033731ef8210e01755fede394