OSDN Git Service

Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
authorErik Kline <ek@google.com>
Wed, 23 May 2018 21:25:29 +0000 (14:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 May 2018 21:25:29 +0000 (14:25 -0700)
commitcf83539e1e8c3b3b4012ff8b2ec5f782b923092c
tree4bf8c6cfef487c90a23e3dd02c346748168e5f9b
parent0cf8b408f9fb935e1da65c5ead99c517c9fcc7cb
parent5a0a7ef4bbeed9b3c54c8fec38c89a3827563e02
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
am: 5a0a7ef4bb

Change-Id: I01f80ccf9c733d280b38250e6735717004cbec1b