tree 8335d11fdcc01714d4e568440ecb848db990d931
parent d848c29008b0847f6dbefb0e4c538e4881d629ae
parent d352f4ca85ff8418a5a58d32fb03b85d7e0b843b
author Luke Huang <huangluke@google.com> 1558621411 -0700
committer android-build-merger <android-build-merger@google.com> 1558621411 -0700

Merge "Add Rfc6724 style sort for DnsResolver and fix potential bug" am: 7a1133eb44
am: d352f4ca85

Change-Id: Ic356f42b46a3ad170fb01f22d9b3e0b7bf1585d4