tree 48f7e7e1c9d2b0913361c2f1a922b3a36b97aa0b
parent 368a21e4a975659615c571a918bb9cb3a7c01c46
parent f4dc25e77d057de867462e9a5a14548b1164545f
author Treehugger Robot <treehugger-gerrit@google.com> 1636148444 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636148444 +0000

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

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

Change-Id: I9c0d1e863a9ee0cf8c64a31cb1970e8f279991a1