commit | ef7c96c988a0c68c387bcbe7efa498c7066f4c34 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Sat Jan 29 08:01:57 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 29 08:01:57 2011 -0800 |
tree | bee7a86a986aad9ab67f17af2330cd430a3d7d32 | |
parent | 563fb235fd91c479f32ced150c66b26ddca27281 [diff] | |
parent | d39664126ed27b816e91312d28b76218f6bd5efb [diff] |
am d3966412: am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc" * commit 'd39664126ed27b816e91312d28b76218f6bd5efb': Add dnsproxyd to keep in sync with base init.rc