tree b91bd61bc1a2a16e3e9250ea9a11aa7caacc364b
parent f45103c464f756e98da67f66ba9af4872cd1980f
parent ef7c96c988a0c68c387bcbe7efa498c7066f4c34
author Jean-Baptiste Queru <jbq@google.com> 1296318914 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296318914 -0800

am ef7c96c9: am d3966412: am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"

* commit 'ef7c96c988a0c68c387bcbe7efa498c7066f4c34':
  Add dnsproxyd to keep in sync with base init.rc