Merge branch 'upstream-17.11-stable' into 17.11.x 23/14623/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 3 Sep 2018 09:48:52 +0000 (10:48 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 3 Sep 2018 09:49:31 +0000 (10:49 +0100)
commitcbcf3d44176009673fbcd7d15671bef56c021f6b
tree03ac41bbf9f5f9f238e62de84d43dcce721b8dab
parent1d9284040a0ba38d86e6eeffdb25f36eeb7a44e1
parent6e7cbd63706f3435b9d9a2057a37db1da01db9a7
Merge branch 'upstream-17.11-stable' into 17.11.x

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