tree ce7aebe6b614c7f8b42b57247277d74034d7d536
parent d442ef3c4a2bd22aa2daf50d96007e5245422f49
parent 970e204a5e059ba47c5d3b35af8d6cad3f326dba
author Elliott Hughes <enh@google.com> 1529080928 -0700
committer android-build-merger <android-build-merger@google.com> 1529080928 -0700

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

Change-Id: Ie1bbf6cea002925bcfe4c5445a5063cab8f30d6f