tree ce7aebe6b614c7f8b42b57247277d74034d7d536
parent d442ef3c4a2bd22aa2daf50d96007e5245422f49
parent 905b525a83ef0e7b4b3e6b2e90524bc882a80210
author Elliott Hughes <enh@google.com> 1529081171 -0700
committer android-build-merger <android-build-merger@google.com> 1529081171 -0700

Merge "Update strace to 4.22." am: 970e204a5e
am: 905b525a83

Change-Id: I1c19eb14915194eebc5aa47fd012425718ac4170