tree e56187594a6b9620305e2f44b3149a617a72e20e
parent 03d26286ba8ea4fb65f0b64417b07d00020941fe
parent b5a6c8066324e75fcdb9692d80b697c7bbd44162
author Elliott Hughes <enh@google.com> 1575393024 -0800
committer android-build-merger <android-build-merger@google.com> 1575393024 -0800

Merge "Upgrade arm-optimized-routines to 1fd2aaae0fcb13f3a53be8de50b68d269145a0a4" am: accf6eb5b6
am: b5a6c80663

Change-Id: Ia7e9581c10f14b3b50984afe371925536e47372d