OSDN Git Service

(root) / android-x86 / system-netd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f86df55 93e6f6a)
am 93e6f6a7: Merge "Make iptables -L and -S calls wait for xtables lock"
authorYusuke Sato <yusukes@google.com>
Thu, 20 Aug 2015 04:04:04 +0000 (04:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 04:04:04 +0000 (04:04 +0000)
* commit '93e6f6a70c83b700aacaa16396449c3d9946b94c':
  Make iptables -L and -S calls wait for xtables lock

1  2 
server/BandwidthController.cpp patch | diff1 | diff2 | blob | history

diff --cc server/BandwidthController.cpp
Simple merge
system/netd
About OSDN
Find Software
Develop Software
Help