| commit | 12d87a3e3cd2b460c5c5add0b00806b17503f23c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sat Jan 29 08:35:14 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 29 08:35:14 2011 -0800 |
| tree | b91bd61bc1a2a16e3e9250ea9a11aa7caacc364b | |
| parent | f45103c464f756e98da67f66ba9af4872cd1980f [diff] | |
| parent | ef7c96c988a0c68c387bcbe7efa498c7066f4c34 [diff] |
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