[automerger skipped] Merge "Fix issue for DnsResolver#query" into qt-dev am: bd5e52bd4d am: dd6b466b89

am: 20446db50a -s ours
am skip reason: change_id Ibb5080acd3c296650d56532fc7da525e9fa95e8f with SHA1 0c60cd9d94 is in history

Change-Id: If5cd009ca06efbb0709c0397eb20bcae2823ede5
This commit is contained in:
Luke Huang
2019-05-30 10:00:17 -07:00
committed by android-build-merger

Diff Content Not Available