tree ec2bb348f640df581c9604dd89d95832f2fce70f
parent 1ac6165be6de9d2f2e4d8567889522c951e72332
parent 92a158a6038011658e360a2e25844eb9ebc2099d
author Michael Ryleev <gmar@google.com> 1494447219 +0000
committer android-build-merger <android-build-merger@google.com> 1494447219 +0000

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

Change-Id: Ia8cc750f785b39a74b242bf1b9e675d6143b72eb