tree 290ce63fb4334384bcdaaf7ba513004e31cbefae
parent eababaa9c5143b65507ca2553a6c5f08759de650
parent 843cb17ce3ebff53268aea6011b1f6eea31e9e78
author Wayne Ma <waynema@google.com> 1565580504 -0700
committer android-build-merger <android-build-merger@google.com> 1565580504 -0700

Merge "Remove support for DNS-over-TLS certificate fingerprints." am: 02eda0692e
am: 843cb17ce3

Change-Id: I792abfa8d2ed7794651b99e78dee2b8dcd4e1296