tree d50190add4ebcf68f9927f680014cbd0e5fd7d17
parent efbc102efc7654edc4123757cf94447256e441a8
parent 85c0c9e38fb68e015d3747de58d1b7f981090e44
author Elliott Hughes <enh@google.com> 1529132480 -0700
committer android-build-merger <android-build-merger@google.com> 1529132480 -0700

Merge "Update strace to 4.23." am: 22c82c4a01
am: 85c0c9e38f

Change-Id: I7f1c5a2a90e407ccd2450c68cb0188de2f9d9615