OSDN Git Service

Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b
authorBen Schwartz <bemasc@google.com>
Fri, 20 Oct 2017 15:18:38 +0000 (15:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 15:18:38 +0000 (15:18 +0000)
am: 3017ebec8c

Change-Id: I94c2f2011bbe29e3d8a39904d19d2b5c606ae0be

1  2 
core/java/android/provider/Settings.java