tree e2b467fd5b425ce1043c99d8a60749655528f7b4
parent b6c602859496e212db78435e2b05ec9418189d6c
parent b1b45b9bd4f8610d7bda99849cac0b14e9ad771d
author Colin Cross <ccross@android.com> 1372890942 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1372890942 +0000

Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."