tree 61faa05b0f1c4157350497bff1bbdac20f5553d4
parent ef91e62806dc0c12f4aa9b37f030b6e859b0b165
parent 2aceafb8b44aa6fd916eb29e0480eb5c3b801f37
author Yohann Roussel <yroussel@google.com> 1481830374 +0000
committer android-build-merger <android-build-merger@google.com> 1481830374 +0000

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

Change-Id: I61d38b23b2633d04d7f7e9bd173c93bb826ac935