tree ec2bb348f640df581c9604dd89d95832f2fce70f
parent a419081bd5ccb1c813bd825aaf1dc0d151d1abb1
parent 277eb1ad5f1af8bb8423e64b0c63f15b47b88a12
author Michael Ryleev <gmar@google.com> 1494448002 +0000
committer android-build-merger <android-build-merger@google.com> 1494448002 +0000

Merge "trusty: fixup trusty build" am: a42478cf3e am: 92a158a603
am: 277eb1ad5f

Change-Id: Ia5acc411ab374fcc06de9fefa90d273782ec869b