tree 61faa05b0f1c4157350497bff1bbdac20f5553d4
parent 03c84a10f72e3c355e560873bd9daddb86467226
parent 5642cc09f4d73b7d2fda2e4b02baa9a075a08641
author Yohann Roussel <yroussel@google.com> 1481829893 +0000
committer android-build-merger <android-build-merger@google.com> 1481829893 +0000

Merge "TEMPORARY HACK: strace and fail on some timeout"
am: 5642cc09f4

Change-Id: Ifb200a4a234642dd86cc09054469cab0563cf70d