tree 37a21c69306801ee7cdda5167a30896c8740155b
parent b00a71fc312c9781fa6f404dccfb55b062b2ccac
parent faa476c0caaa598afa5a6109d17102db5fe35ec6
author Alistair Delva <adelva@google.com> 1613509282 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613509282 +0000

Merge branch 'aosp/upstream-master' into HEAD am: faa476c0ca

Original change: https://android-review.googlesource.com/c/platform/external/arm-trusted-firmware/+/1589611

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a25534ceed4f8e188510641080d8b8ed49b8f62