diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-04-24 05:34:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-24 05:34:29 -0700 |
| commit | 80aec91b46302c43b34629eb3f57f46b25ca3754 (patch) | |
| tree | 027ffbc3267a15fa777350c87d3d6a6337789fd0 /tools/aapt2/diff/Diff.cpp | |
| parent | 652471e397a59d8297959369d43a2541b89b1b12 (diff) | |
| parent | 37673bcd682d7b2b6cb9d212dec123f03a031a15 (diff) | |
[automerger skipped] Add a timeout for the DNS probe. am: 28c966eaa9 -s ours
am: 37673bcd68 -s ours
am skip reason: change_id Ib3ab9105d7ae39f551b51e8d5a04b9ec5e549655 with SHA1 6413419435 is in history
Change-Id: I45f5f108935d238e5a374004ba37cc1f0206bf03
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions