tree b154056ea7fa044bb8e7d8f3d6fc1a9da03a9b98
parent 9b5c00a386c5524599b3454cbda78a075757625a
parent ae7b7e9bb66f2fe650fbb42134ed84c84fa1b18f
author Chris Forbes <chrisforbes@google.com> 1526924074 -0700
committer android-build-merger <android-build-merger@google.com> 1526924074 -0700

Merge "Switch x86/x64 trampolines to use __attribute__((naked))" into pi-dev am: 370b0a1048
am: ae7b7e9bb6

Change-Id: I5cb8d5afe8e95951a239d722368f3bc112ad8294