commit | 0e7ad30895ad97ce9b4385f64a61156fff18e037 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Nov 05 20:46:48 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 05 20:46:48 2021 +0000 |
tree | 48f7e7e1c9d2b0913361c2f1a922b3a36b97aa0b | |
parent | 8e4194a868eef2caa762900972bb907a95efc68a [diff] | |
parent | 340853027b425efd8374c3ff318ce403aa77a9b1 [diff] |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into HEAD" am: 340853027b Original change: https://android-review.googlesource.com/c/platform/external/arm-trusted-firmware/+/1824194 Change-Id: Ie6fe3329847f882af3dae22366e786423fd2a546