commit | 2350c91ae85275be06818c329a74f21b60764906 | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Wed Aug 10 01:24:29 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 01:24:29 2016 +0000 |
tree | 66920459a6bc5355d2cef342ddbfe763a8be1f31 | |
parent | 646f89930c84131bc728f6419f9c743e986d856b [diff] | |
parent | 63bed4cf99b6bacbebee101012e902319f857b2a [diff] |
Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev am: c14748b366 am: 876a98e5ff am: 63bed4cf99 Change-Id: Ida508af83327563e39cda89410258925819381d8