Merge branch 'upstream-16.11-stable' into 16.11.x 60/13660/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Tue, 24 Jul 2018 15:54:23 +0000 (16:54 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 24 Jul 2018 15:54:26 +0000 (16:54 +0100)
commitba78d0104e4ce61135ffb26a39dac0d57b00824b
treeaeaa93c3b7febdc8bfa46510d93dd05c0e3747d3
parent6fce689301aa6be62eb0786519ff1eaf27bf00c8
parent43192222b329b3c984687235b0081c7fbfe484ba
Merge branch 'upstream-16.11-stable' into 16.11.x

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