tree cac7bd52e7a7cb1b8cab9c698d743a6d1535b411
parent 3dae5ca9d606ae0a55a15aa7a79d46c97c3803ca
parent 7552e2de9daecc1aaa63c1a799c16c095daa38a0
author Erik Kline <ek@google.com> 1481531354 +0000
committer android-build-merger <android-build-merger@google.com> 1481531354 +0000

Merge "Stop setting net.dns{1234} system properties."
am: 7552e2de9d

Change-Id: I9b31b281896995943ce8217c3230867db380a841