tree 2867e9a1db9cdefc87350cc09015c00579312118
parent 1821136365d876607d60d711388fcd5b1dcd993a
parent 9f473c5e2966133fd29daebb01adbbd1fa6dbb69
author Narayan Kamath <narayan@google.com> 1485191647 +0000
committer android-build-merger <android-build-merger@google.com> 1485191647 +0000

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

Change-Id: I3b140ddfcc63833545087e057565e6124b62b747