tree 290ce63fb4334384bcdaaf7ba513004e31cbefae
parent 8c4785cde19eeb109ac5c3f37dba1fec5b2176db
parent 3c583971b82bff81d9b61e78be4e2e71dfafca76
author Wayne Ma <waynema@google.com> 1565581118 -0700
committer android-build-merger <android-build-merger@google.com> 1565581118 -0700

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

Change-Id: I1b5bd0d9f007c874d55efe8e6098b953f9e2cd14