Merge branch 'upstream-18.02-stable' into 18.02.x 50/12050/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 23 Apr 2018 13:49:51 +0000 (14:49 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 23 Apr 2018 13:49:55 +0000 (14:49 +0100)
commit38b32e29d8d1f414f0f1d913720e8d13961cb307
treef6ce6ec06ceb9652b752902fdf5b6c8aafd2a990
parent3a03658c8707af2ec77e70c0602442dbde26a8e5
parent9f3a8cb4cfe59ea63e267f69700fb0fde13d7dd3
Merge branch 'upstream-18.02-stable' into 18.02.x

Change-Id: I24611dda504db6f91820cff92593820e1d3db08f
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>