| commit | f1dfc7afff9c6957ad637871b280afb7d7ed208f | [log] [tgz] |
|---|---|---|
| author | Luke Huang <huangluke@google.com> | Wed Jun 12 01:33:38 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 12 01:33:38 2019 -0700 |
| tree | cc991d3ecffb5efcf91055e6e3f7ce36a097f075 | |
| parent | f6100a27b7dccbfc8e247e5870bbe973d88d8b52 [diff] | |
| parent | 930d4003f4e1efa5702e8fdf968eb353c03a29ec [diff] |
[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 am: 930d4003f4 -s ours am skip reason: change_id I443bb11b15845b079ee4370a7797e692e62fa3c8 with SHA1 07de4cf82a is in history Change-Id: I45c5e6309a6218448b82b7226aa3190177058bb4