OSDN Git Service
(root)
/
android-x86
/
system-netd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
732c34e
6ef96c4
)
am 6ef96c48: Merge "Config NFLOG target before listening."
author
Jeff Sharkey
<jsharkey@android.com>
Fri, 23 Jan 2015 19:37:36 +0000
(19:37 +0000)
committer
Android 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