OSDN Git Service

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

Change-Id: I30f6c28acc3825ff51190d1d54494cac5d774497
res/xml/development_prefs.xml
src/com/android/settings/development/DevelopmentSettings.java