tree 975974a94974113bffb9705e8d0c4d2af46e5286
parent 821cca696a2d6373b74a9fd2e4b29bce79e9625d
parent 3a3b8f648b12acbc9d0621cee54b20d4fd28cc4c
author Elliott Hughes <enh@google.com> 1487271209 +0000
committer android-build-merger <android-build-merger@google.com> 1487271209 +0000

Merge "Disable broken mips strace build." am: 6ec9d87c7a am: 3b3771506e
am: 3a3b8f648b

Change-Id: I348ceee2ea3f4ee3e3b4d9c2c5c312ead0cc56a0