tree 4b0da9dce35635a264d079fb8ef8b27a16430c29
parent c3d5666b1d90abd892656852567bf3b5fb63ab29
parent 82a9da497595b1d173f522e22d316845b7ef4dcb
author Elliott Hughes <enh@google.com> 1519443285 +0000
committer android-build-merger <android-build-merger@google.com> 1519443285 +0000

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

Change-Id: I9c31dd6d6b9e523e63f09598179a8bf5b7ab21b9