Merge branch 'upstream-16.11-stable' into 16.11.x 49/8249/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Wed, 30 Aug 2017 14:10:05 +0000 (15:10 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 30 Aug 2017 14:10:26 +0000 (15:10 +0100)
commit9aadcb375dc58f872e053d5a0b7d940ab27bf5c1
treecace50586fb4a3d76f80af797d83106e06938c29
parent6c18b67ebd7a60d68452ca4b4b411fc8fa8ea4be
parentfdd2322bb45e83d3fd96b06ea32a4afbb60bcb6f
Merge branch 'upstream-16.11-stable' into 16.11.x

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