| commit | 149a9b68ab09e4934556e9247ee5f98008a65662 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Jul 03 15:45:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 03 15:45:16 2013 -0700 |
| tree | 747a6b8891d0c685d805a9c254760a46800adccb | |
| parent | b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a [diff] | |
| parent | fafcabd0dd4432de3c7f5956edec23f6ed241b56 [diff] |
am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default." * commit 'fafcabd0dd4432de3c7f5956edec23f6ed241b56': Added net.dns1 prop for emulator, as Android emulator ignores it by default.