commit | cbabb00407e1b24a8e832110f8ea88b340591f85 | [log] [tgz] |
---|---|---|
author | Lucas Lin <lucaslin@google.com> | Wed May 12 18:24:14 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 12 18:24:14 2021 +0000 |
tree | 82ff5b99d44757c06dc36789dba356cebf45bf5a | |
parent | 01613adbe41feee9d106633794cf2e940eeab518 [diff] | |
parent | 2732048e77e08a962f5ebec76fc371aea70826db [diff] |
[automerger skipped] Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" am: d56f4a700b am: 71d233730c am: 2732048e77 -s ours am skip reason: Merged-In Iafcd861714d8aca44cede658ed630f9d5afd5e59 with SHA-1 75ba4e7873 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1696705 Change-Id: I54a257134e9830cd3809a59f5993cef1118f2e7e