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)
commit876a98e5ff20a3b569f7a73f72c80fdd4948cd99
treea39a2ec1b2307045c48bdf65675618cc2bb245ac
parent5fe2c0379fb30ef978f26ad108574be2ff06ec08
parentc14748b366c09f9732cb4f6943e3b2734ea71f2f
Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev
am: c14748b366

Change-Id: I43a8576a8aabc30f447caa062c3730b2160aec6b