OSDN Git Service

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

Change-Id: Ia64a8318ad2f57aa3dc58a13d20274b877649fef
core/java/android/provider/Settings.java
core/tests/coretests/src/android/provider/SettingsBackupTest.java
packages/SettingsLib/res/values/strings.xml
services/core/java/com/android/server/NetworkManagementService.java