OSDN Git Service

Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev...
authorErik Kline <ek@google.com>
Wed, 10 Aug 2016 01:15:40 +0000 (01:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 01:15:40 +0000 (01:15 +0000)
am: 876a98e5ff

Change-Id: Ic82a1715c7bd31b149a326f6fc56818879e76f1a


Trivial merge