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:
13635f0
11454a2
)
Merge "Network-related commands porting" am: 9b20115264 am: 923aa75d75
author
Luke Huang
<huangluke@google.com>
Tue, 16 Oct 2018 09:32:50 +0000
(
02:32
-0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 16 Oct 2018 09:32:50 +0000
(
02:32
-0700)
am:
11454a2163
Change-Id: I61fea40c9659f1eed1638cc196d309289393d6a5
1
2
services/core/java/com/android/server/NetworkManagementService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/NetworkManagementService.java
Simple merge