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:
fe45f1b
dc98806
)
Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
author
Jeff Sharkey
<jsharkey@google.com>
Mon, 12 Oct 2015 16:34:19 +0000
(16:34 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 12 Oct 2015 16:34:19 +0000
(16:34 +0000)
1
2
services/core/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/ConnectivityService.java
Simple merge