Merge changes from topic "am-d829724f7889490d818e6069212702eb" into qt-r1-dev-plus-aosp

* changes:
  Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: d8bc2b5a15 am: f0b1dc8df4
  [automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug am: 51b9f6c069 -s ours am: 2fdaf771d6 -s ours am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history
This commit is contained in:
Android Build Merger (Role)
2019-05-28 05:58:48 +00:00
committed by Android (Google) Code Review

Diff Content Not Available