diff options
| author | Colin Cross <ccross@android.com> | 2013-07-03 15:51:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-03 15:51:11 -0700 |
| commit | 894de2202162a528d035e6189d2ea927547f669d (patch) | |
| tree | ffabb4141d8341477eef9bd24979fbfb8d0b134b /base/errors_unix.cpp | |
| parent | fb3280886d9366d26e9c2ce41f95d8265c025aa1 (diff) | |
| parent | 983939f79453433ca67b5382673b891d94343273 (diff) | |
am 983939f7: am 149a9b68: am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
* commit '983939f79453433ca67b5382673b891d94343273':
Added net.dns1 prop for emulator, as Android emulator ignores it by default.
Diffstat (limited to 'base/errors_unix.cpp')
0 files changed, 0 insertions, 0 deletions