OSDN Git Service

Merge "Add a developer option for controlling DNS over TLS" am: c8207de343
authorBen Schwartz <bemasc@google.com>
Fri, 20 Oct 2017 15:15:14 +0000 (15:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 15:15:14 +0000 (15:15 +0000)
am: ed97eaeb4a

Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240


Trivial merge