tree 05534836ae079a27345b978fb47bfbacc737c22f
parent 5e80400eb59677d8132e458e5a86a93084166127
parent 10629c6202f110b668471e91415824fdd0f14425
author Yohann Roussel <yroussel@google.com> 1487859660 +0000
committer android-build-merger <android-build-merger@google.com> 1487859660 +0000

Merge "Revert "TEMPORARY HACK: strace and fail on some timeout"" am: e5fa447366
am: 10629c6202

Change-Id: I2076a5e82c7df65efb57ac1d93ec6557eee0f6af