OSDN Git Service

am 6ef96c48: Merge "Config NFLOG target before listening."
authorJeff Sharkey <jsharkey@android.com>
Fri, 23 Jan 2015 19:37:36 +0000 (19:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 Jan 2015 19:37:36 +0000 (19:37 +0000)
* commit '6ef96c4862428e02a0c4aebbfa1ed0ccbf58b46e':
  Config NFLOG target before listening.


Trivial merge