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