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:
1bc1936
2965d33
)
Merge "Add a method to start the captive portal login app."
author
Hugo Benichi
<hugobenichi@google.com>
Fri, 19 May 2017 02:29:19 +0000
(
02:29
+0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Fri, 19 May 2017 02:29:21 +0000
(
02:29
+0000)
1
2
services/core/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/connectivity/NetworkMonitor.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/net/java/com/android/server/ConnectivityServiceTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/ConnectivityService.java
Simple merge
diff --cc
services/core/java/com/android/server/connectivity/NetworkMonitor.java
Simple merge
diff --cc
tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge