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