tree 08cf27ae360cd759f528509ad9c2a232ac027277
parent 7ab03d11267026fec90c5d03addf440b963803d8
parent 11561ffeb01b65b48885a736b7ff8cbca2a8860f
author Wayne Ma <waynema@google.com> 1556106825 -0700
committer android-build-merger <android-build-merger@google.com> 1556106825 -0700

Merge "resolv: add missing tlsServers and tlsFingerprints in log"
am: 4b0f40fa5f

Change-Id: I0a624aca9a150cf685d67e32e6fdf7edf5145f95