| commit | 34b6911423a1340d5f1b7f55bd7b54168b0a4706 | [log] [tgz] |
|---|---|---|
| author | Luke Huang <huangluke@google.com> | Tue Jun 15 17:19:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 15 17:19:41 2021 +0000 |
| tree | 8fa1ed170c63974db9ac2d410cf819bb5e44990e | |
| parent | af578b22a07c700f332f5d1579444ac387af567b [diff] | |
| parent | a040a3d5680351a791333bc0f63b8006f93db486 [diff] |
[automerger skipped] Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev am: fcc69726ed -s ours am: a040a3d568 -s ours am skip reason: Merged-In I4c485a5d8fb4d6f52d82633a579bce4feb5c6375 with SHA-1 a46c4d2726 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963260 Change-Id: Ie745a3f3d5fb52350354664f3b61aadaed773784