OSDN Git Service

[automerger skipped] Merge "Use AI_ADDRCONFIG for most DNS requests" am: b19a838f47...
authorRemi NGUYEN VAN <reminv@google.com>
Fri, 25 May 2018 08:22:11 +0000 (01:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 May 2018 08:22:11 +0000 (01:22 -0700)
am: bd531604e0  -s ours

Change-Id: I14b2f2e1e7e2f7a20fc9d9ca4f614c1bbec09ec7


Trivial merge