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:
4a27a1b
3ce3bc4
)
Merge "Pass all relevant resolver info to netd" am: 76f64641bb
author
Erik Kline
<ek@google.com>
Sat, 24 Mar 2018 01:16:37 +0000
(
01:16
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 24 Mar 2018 01:16:37 +0000
(
01:16
+0000)
am:
3ce3bc4582
Change-Id: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
1
2
services/core/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/NetworkManagementService.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/NetworkManagementService.java
Simple merge
diff --cc
tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge
OSDN Git Service
