tree 49ce78fb4bea4d5c503e8755324ca0c071851fc4
parent 469b8829479f031172e24eedfd473eac0782830c
parent b21a085baeaec8c3c3288b98096c24b279231b01
author Gilles Peskine <Gilles.Peskine@arm.com> 1520894610 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1520894610 +0100

Merge remote-tracking branch 'upstream-public/pr/1241' into development-proposed