tree 4e293d63e61351539e549cbe28a69efbc24136d6
parent 22d359d64bf4bc0a1d6c00dc835e03ce2e93272e
parent 222ec16d6073335c8bb5eb6e738ddc2df1c2cceb
author Elliott Hughes <enh@google.com> 1499373697 +0000
committer android-build-merger <android-build-merger@google.com> 1499373697 +0000

Merge "Update strace to 4.18."
am: 222ec16d60

Change-Id: I4126bbea41308cda1eee87153400bd50dc7befdf