| commit | 21de417bf7501457bbe383f551a5e012c11381ce | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Mon Oct 30 12:19:50 2017 -0700 |
| committer | John Stultz <john.stultz@linaro.org> | Mon Oct 30 12:19:50 2017 -0700 |
| tree | eeec888aa7b85c109be64d7393a8a983711bd4bc | |
| parent | 8fa3096942d2faed55122efd47348dacca991141 [diff] | |
| parent | fd3bba4bd523ee622c448e64e946d2d3b1875d02 [diff] |
Merge branch 'armtf/master/update' into bootloader-update Big transition to upstream ARMTF code. This merges the aosp/mater code with fd3bba4bd523 but merges such that the tree should be identical with the fd3bba4bd523 side of the merge. Change-Id: Ib416a13ce19c6c26fb62c38ccc6fdfbbdf9c4304 Signed-off-by: John Stultz <john.stultz@linaro.org>