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:
c8494ab
8255c2d
)
Merge "Add configurable captive portal probes" into pi-dev
author
Remi NGUYEN VAN
<reminv@google.com>
Wed, 23 May 2018 14:26:39 +0000
(14:26 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 23 May 2018 14:26:39 +0000
(14:26 +0000)
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
services/core/java/com/android/server/connectivity/NetworkMonitor.java
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
services/core/java/com/android/server/connectivity/NetworkMonitor.java
Simple merge
OSDN Git Service
