diff options
| author | Erik Kline <ek@google.com> | 2015-11-25 12:49:38 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2017-01-18 19:07:33 +0900 |
| commit | e9e251fcfb0bb0d8bcaaeff5f905cc93981da910 (patch) | |
| tree | 755490872c0091dcb32cc6edad355ecfbad9aa9a /tools/aapt2/diff/Diff.cpp | |
| parent | db5814ed3dee49c578051f8ac26a2beb5d16cdbb (diff) | |
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
(cherry-pick of 06c3ef1367e850746eef0a5462bdce8674d74c30)
(cherry picked from commit 57faba9ec73fbb311d5ca1df3278aee9728589d5)
Bug: 21414325
(cherry picked from commit 3841a48d0a093bbbd6ffe6338170e1e2dbc11997)
Change-Id: I640c43315a071ecbf881e5ce898164915e0b787f
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions