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

Browse Source

* commit 'fafcabd0dd4432de3c7f5956edec23f6ed241b56':
  Added net.dns1 prop for emulator, as Android emulator ignores it by default.

...

This commit is contained in:

Colin Cross 2013-07-03 15:45:16 -07:00 committed by Android Git Automerger

parent b1a9f8cf4b fafcabd0dd

commit 149a9b68ab

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available