| commit | ab81ffe2defa3294e09b70372e2179db2377c894 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 27 13:55:02 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 27 13:55:02 2011 -0800 |
| tree | 2a27ae5e3a743c07ec11a6a0e972e61c4e56cd7c | |
| parent | ad3e00724d62e5def2f2552533a62a800e9f3ee9 [diff] | |
| parent | 70b8941f19440592938bdb5c453b16be4d1d8c31 [diff] |
am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc" * commit '70b8941f19440592938bdb5c453b16be4d1d8c31': Add dnsproxyd to keep in sync with base init.rc