tree 87c2d922aa430a0dec55491fdabb4e727bcd0600
parent cca755cfacf04b2ee5efc1de0dbbf43ece648486
parent 1fd46833ef537b0a894575f98fc152ee5c1b5876
author Ben Schwartz <bemasc@google.com> 1508513630 +0000
committer android-build-merger <android-build-merger@google.com> 1508513630 +0000

Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a
am: 1fd46833ef

Change-Id: I30f6c28acc3825ff51190d1d54494cac5d774497