OSDN Git Service

am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
authorJean-Baptiste Queru <jbq@google.com>
Thu, 27 Jan 2011 21:55:02 +0000 (13:55 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Jan 2011 21:55:02 +0000 (13:55 -0800)
* commit '70b8941f19440592938bdb5c453b16be4d1d8c31':
  Add dnsproxyd to keep in sync with base init.rc


Trivial merge