am 149a9b68: am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator,...
am 149a9b68: am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
* commit '149a9b68':
Added net.dns1 prop for emulator, as Android emulator ignores it by default.