OSDN Git Service

(root) / android-x86 / system-netd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 158e8f3 9997f9a)
am 9997f9a3: resolved conflicts for merge of e36a3a2f to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Fri, 15 Jun 2012 00:09:03 +0000 (17:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Jun 2012 00:09:03 +0000 (17:09 -0700)
* commit '9997f9a3edac2baac244c2fe8e49685a3be9f482':
  Run dnsmasq with options --keep-in-foreground and --pid-file.


Trivial merge
system/netd
About OSDN
Find Software
Develop Software
Help