tree f0e45956576f54b3fcc65025fef46e8afde451a6
parent 4ed8f06b30487601f61c2d0417488128d1757923
parent 786cf5ce750efa74401b421baac6cedabff366b6
author Jorge E. Moreira <jemoreira@google.com> 1594307821 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594307821 +0000

Merge with upstream-master am: 87c4721c8a am: f50b4deed5 am: 5cbabddc28 am: 786cf5ce75

Original change: https://android-review.googlesource.com/c/platform/external/pffft/+/1354143

Change-Id: I693f0affb4e3636f42a23c6513348fd47a2de4fc