[automerger skipped] Merge "Merge "Fix issue for DnsResolver#query" into qt-dev am: bd5e52bd4d am: 308ae8f73c" into qt-r1-dev-plus-aosp

Browse Source

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

Change-Id: Ib47ff2cace7d2c1a8baac653a4f480ecd074b8e1

...

This commit is contained in:

Luke Huang

2019-05-30 10:04:40 -07:00

committed by android-build-merger

parent 431671cf01 94dc5ff9cb

commit 7aac233f38

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available