Merge branch 'upstream-16.11-stable' into 16.11.x 54/12054/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 23 Apr 2018 13:20:17 +0000 (14:20 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 24 Apr 2018 07:23:10 +0000 (08:23 +0100)
commit5076209fa6f4affdf93f4d2f23f51a427f64f72b
tree2dd6d71d781670133d79938ba6a3c27163e82306
parent68f5e9d7d40c36c6ea398953af7e56519928ea78
parent18af4227fa5eee002b1a79207935620f6112803e
Merge branch 'upstream-16.11-stable' into 16.11.x

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