OSDN Git Service

am 451ca998: Merge "Make netd calls to iptables wait for xtables lock" into mnc-dev
authorPaul Jensen <pauljensen@google.com>
Tue, 4 Aug 2015 18:37:33 +0000 (18:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 18:37:33 +0000 (18:37 +0000)
* commit '451ca998f1eed36d5fefb5593ed43605c4d6c0bd':
  Make netd calls to iptables wait for xtables lock


Trivial merge