| commit | a85c81dcec809f33a69b20c877f4e28858566315 | [log] [tgz] |
|---|---|---|
| author | Alistair Delva <adelva@google.com> | Tue Feb 16 21:19:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 16 21:19:26 2021 +0000 |
| tree | 37a21c69306801ee7cdda5167a30896c8740155b | |
| parent | b00a71fc312c9781fa6f404dccfb55b062b2ccac [diff] | |
| parent | efb2826bb8160e2d8e0fcec85133a7468484f9fd [diff] |
Merge branch 'aosp/upstream-master' into HEAD am: faa476c0ca am: efb2826bb8 Original change: https://android-review.googlesource.com/c/platform/external/arm-trusted-firmware/+/1589611 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia57dd7d019f5d4db6bf94f428c9ba3cdb2cd820e