tree ec2bb348f640df581c9604dd89d95832f2fce70f
parent 16a5f25f0f6cc489a75cbdd5305592bee96aebd0
parent a42478cf3ea077da6d53bde3ced09fd419a50de4
author Michael Ryleev <gmar@google.com> 1494447072 +0000
committer android-build-merger <android-build-merger@google.com> 1494447072 +0000

Merge "trusty: fixup trusty build"
am: a42478cf3e

Change-Id: I057cf9914787c5022f937a6cc955fdaa8cb83f79