OSDN Git Service

Merge "Create a string for private DNS "On""
authorLucas Lin <lucaslin@google.com>
Wed, 24 Jul 2019 03:45:49 +0000 (20:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Jul 2019 03:45:49 +0000 (20:45 -0700)
commit903e8dac6cddef9a6e4de1db7186678152a05655
tree84932cf6158f45ba984972f90ad65dd1e515102a
parentba73db3e927be38e1be3cf8d8b3c481f647ec3fb
parenta64f8d95218076d5872ca3404da4e807c09ed160
Merge "Create a string for private DNS "On""
am: a64f8d9521

Change-Id: I154269dc91acbefdce3cb6f76513d6b4f08f568b
res/values/strings.xml
src/com/android/settings/network/PrivateDnsPreferenceController.java
tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java