[automerger skipped] Merge "Merge "Fix race condition caused by fd reused for DnsResolver" into qt-dev am: 7187dbc4e0 am: f7e2b55a70" into qt-r1-dev-plus-aosp

Browse Source

am: c9a79df363 -s ours
am skip reason: change_id I443bb11b15845b079ee4370a7797e692e62fa3c8 with SHA1 7520cb0a4d is in history

Change-Id: I45c5e6309a6218448b82b7226aa3190177058bb4

...

This commit is contained in:

Luke Huang

2019-06-12 01:33:38 -07:00

committed by android-build-merger

parent 05d0d8dfe0 c9a79df363

commit 5d29cbf568

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