tree b4216f1ef5609cc7bf3e34b86d12c4a4548f9268
parent c64a30002722ebf6e728c80078a4bbe0f1208ad2
parent fe0669f52ac62abf3a25c58e737eb467d013aa31
author Jaeden Amero <jaeden.amero@arm.com> 1524850067 +0100
committer Jaeden Amero <jaeden.amero@arm.com> 1524850067 +0100

Merge remote-tracking branch 'upstream-restricted/pr/477' into development-restricted-proposed