tree 48f7e7e1c9d2b0913361c2f1a922b3a36b97aa0b
parent 8e4194a868eef2caa762900972bb907a95efc68a
parent 8a51068b5fb9d535e1196ec12bcf56f85092816f
author Treehugger Robot <treehugger-gerrit@google.com> 1636147722 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636147722 +0000

Merge "Merge remote-tracking branch 'aosp/upstream-master' into HEAD" am: 340853027b am: 0e7ad30895 am: 4c63dcff82 am: 8a51068b5f

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

Change-Id: I4d4b3b68451f2c35bf5e6bc35afde887606767ad