tree 7deda0d457ed08ff00859dc772d8a1b3f2fddd45
parent edf8c04a02bfa44d8e59dbdf78a2b56e25e3b588
parent 37c886fc6c73c8943c257c3f9ea6dbe1780e5165
author Hugo Benichi <hugobenichi@google.com> 1481589771 +0000
committer android-build-merger <android-build-merger@google.com> 1481589771 +0000

Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev am: 4efaee1d0f
am: 37c886fc6c  -s ours

Change-Id: I588e21de6e4a369d9d37d7d206b5e791752c1904