tree 2867e9a1db9cdefc87350cc09015c00579312118
parent cb732f6ab1d3259e37de10ee3769bc17fbb53ad3
parent 822ce832c7efbb55583e7751e661659d9041f2de
author Narayan Kamath <narayan@google.com> 1485191449 +0000
committer android-build-merger <android-build-merger@google.com> 1485191449 +0000

Merge "iptables: Change locking semantics." am: 7ce69df55d am: 850b49ca1f
am: 822ce832c7

Change-Id: I6d8a9556ea29dee8d6d48a28dc4131a63edd9ea7