tree b0e5ffffaa152de78e8c95df81bca52d46856c9c
parent 8aa916a190da43c878271b7c002960e939146243
parent 2bba69786b37d719de5dbfced0ebaf50165fff37
author Elliott Hughes <enh@google.com> 1495822696 +0000
committer android-build-merger <android-build-merger@google.com> 1495822696 +0000

Merge "Disable broken mips strace build." am: 5312218a62 am: f100cc89fa am: 5829b8e9c9
am: 2bba69786b

Change-Id: I15d4991bddcfd3dedaf84a24588fb737ac544ab9