tree be3dade0dac438403b9b4180f10e2524c3bbd6a8
parent b71d6f8268f9afe1afacc08cf3cf719bcdec34df
parent 98414f45d516dde35ac19010d5dfb40998bcccfa
author Colin Cross <ccross@android.com> 1570483660 -0700
committer android-build-merger <android-build-merger@google.com> 1570483660 -0700

Merge "Remove old-style support for translated second architectures" am: c6136c9d65 am: 2e7e4df578 am: 3a10b29e2c
am: 98414f45d5

Change-Id: I87c857d22ba27f69f3c00a16d14206446f1fbc5c