tree 4b0da9dce35635a264d079fb8ef8b27a16430c29
parent 10c524dc7533628f28dbb9dd14de406475675312
parent f467e88f6f275dec76e6b127eab942e2b5b6b0d9
author Elliott Hughes <enh@google.com> 1519442803 +0000
committer android-build-merger <android-build-merger@google.com> 1519442803 +0000

Merge "Update strace to 4.21." am: 5b3348ca5f
am: f467e88f6f

Change-Id: I2061474eda464ece890ae3728da44ffefb9cfb4b