| commit | 850b49ca1f9c6913a9e8abf17f0b063ef438dc45 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Jan 23 17:04:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 23 17:04:19 2017 +0000 |
| tree | 2867e9a1db9cdefc87350cc09015c00579312118 | |
| parent | 199fce01185992c5ec923505836647ee2ca63019 [diff] | |
| parent | 7ce69df55d5a599246b39b28188a6f70e4d25f31 [diff] |
Merge "iptables: Change locking semantics." am: 7ce69df55d Change-Id: I6d6398e84499f12408d83aad715ae7d14c53f13e