tree 61faa05b0f1c4157350497bff1bbdac20f5553d4
parent 8b24bdc2d09892bc41d772c8ba211d83d53193b8
parent 0d6238d7fa241d6a17b8f9f976db767510ad7936
author Yohann Roussel <yroussel@google.com> 1481830841 +0000
committer android-build-merger <android-build-merger@google.com> 1481830841 +0000

Merge "TEMPORARY HACK: strace and fail on some timeout" am: 5642cc09f4 am: 2aceafb8b4
am: 0d6238d7fa

Change-Id: I7865b139efeea04db4e68c6fd6df88cc4529d38d