tree cfddf13024e3917e17a9debc8b7391c9fe1559ed
parent 8d944ebe543a96248ec4f6be2cd84ad3df418ae7
parent f174ca62c552149d51472717a480e2a571885b9a
author Elliott Hughes <enh@google.com> 1510866664 +0000
committer android-build-merger <android-build-merger@google.com> 1510866664 +0000

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

Change-Id: Ieb202f299496500af91274b8fcbc0680d688ab87