tree 6438db636cfa06c78cf13430d8e5e1a2eae272b1
parent e0cc535246ea173d6bc73e78c59bc01fb250f75a
parent 918acf867e2a247b832cff30a7154d45f0d8f30c
author Mike Yu <yumike@google.com> 1571049312 -0700
committer android-build-merger <android-build-merger@google.com> 1571049312 -0700

Merge "Make private DNS connect timeout configurable"
am: 918acf867e

Change-Id: Ibb309e80d223e653c024ce45bd2e6cb002822b75