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:
7a7f156
f0ddd72
)
Merge "APF: drop multicast ICMPv6 while in doze mode" am: 7880e284c8
author
Bernie Innocenti
<codewiz@google.com>
Mon, 2 Apr 2018 18:22:47 +0000
(18:22 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 2 Apr 2018 18:22:47 +0000
(18:22 +0000)
am:
f0ddd72f0f
Change-Id: I2827fc9159fe8d372d881451b9971ddcc4a0530f
1
2
services/net/java/android/net/apf/ApfFilter.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/net/java/android/net/apf/ApfFilter.java
Simple merge