OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bfe996f
7e7c472
)
Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b am: 3017ebec8c...
author
Ben Schwartz
<bemasc@google.com>
Fri, 20 Oct 2017 15:45:24 +0000
(15:45 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 20 Oct 2017 15:45:24 +0000
(15:45 +0000)
am:
7e7c472d9a
Change-Id: I0c066afaa0d6d776cac08cbc7bd97dbf5b29a8be
1
2
core/java/android/provider/Settings.java
patch
|
diff1
|
diff2
|
blob
|
history
core/tests/coretests/src/android/provider/SettingsBackupTest.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SettingsLib/res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/provider/Settings.java
Simple merge
diff --cc
core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge
diff --cc
packages/SettingsLib/res/values/strings.xml
Simple merge