OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ba73db3
a64f8d9
)
Merge "Create a string for private DNS "On""
author
Lucas Lin
<lucaslin@google.com>
Wed, 24 Jul 2019 03:45:49 +0000
(20:45 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 24 Jul 2019 03:45:49 +0000
(20:45 -0700)
am:
a64f8d9521
Change-Id: I154269dc91acbefdce3cb6f76513d6b4f08f568b
1
2
res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/network/PrivateDnsPreferenceController.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/strings.xml
Simple merge
diff --cc
src/com/android/settings/network/PrivateDnsPreferenceController.java
Simple merge
diff --cc
tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
Simple merge
OSDN Git Service
