Merge tag 'upstream/17.11.2' into 17.11.x 52/12052/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 23 Apr 2018 13:40:11 +0000 (14:40 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 23 Apr 2018 13:40:14 +0000 (14:40 +0100)
commit7c4b9beec79dd1dc27367ee1f45162d80bf14c4a
tree039ce8a72ae56d6fb18e3196c9803b2ecceca35d
parent1b7955fbb6123d3d1f7c7a0476e4bb812cbafa12
parentd038355bf358f713efbb182f174e2a8a09042e2b
Merge tag 'upstream/17.11.2' into 17.11.x

Upstream version 17.11.2

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