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 00:58:03 +0000 (00:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 00:58:03 +0000 (00:58 +0000)
am: c14748b366

Change-Id: I43a8576a8aabc30f447caa062c3730b2160aec6b


Trivial merge