tree cfddf13024e3917e17a9debc8b7391c9fe1559ed
parent 54f7b5c191597ddfae6d45574faed592f10cae6d
parent 10c524dc7533628f28dbb9dd14de406475675312
author Elliott Hughes <enh@google.com> 1510867136 +0000
committer android-build-merger <android-build-merger@google.com> 1510867136 +0000

Merge "Update strace to 4.20." am: 18120556c1 am: f174ca62c5
am: 10c524dc75

Change-Id: I9e0d6fcc6ce0e0df327c69423e8dff4bf99b48ac