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:
8b9730f
b41c9f7
)
Merge "system_server: add two child chains to firewall" into mnc-dev
author
Xiaohui Chen
<xiaohuic@google.com>
Wed, 17 Jun 2015 23:50:23 +0000
(23:50 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 17 Jun 2015 23:50:28 +0000
(23:50 +0000)
1
2
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
Simple merge