OSDN Git Service

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)
commit4f931639b8d4fd92db16431d97e3fd18feb477f9
tree3cbdf3c567dd211cf436b8396a6e51a3d923f275
parent158e8f3613093fdf7b146cab89b08e8dc457a903
parent9997f9a3edac2baac244c2fe8e49685a3be9f482
am 9997f9a3: resolved conflicts for merge of e36a3a2f to jb-dev-plus-aosp

* commit '9997f9a3edac2baac244c2fe8e49685a3be9f482':
  Run dnsmasq with options --keep-in-foreground and --pid-file.