tree 3f83465edb82ccaae4ac73828745bc0e8711c607
parent f49a651d2d727b2ff2a267a1cd8694df6ec66c0a
parent 9ba36c075d66cf8d11aec32d91962d9fd891e283
author Luke Huang <huangluke@google.com> 1552975459 -0700
committer android-build-merger <android-build-merger@google.com> 1552975459 -0700

Merge "Improve test for the changing of DnsResolver" am: fd3e15e0c5
am: 9ba36c075d

Change-Id: I3b2845bee8438a2eaae51c7856486a2d947f30f1