Merge branch 'upstream-16.11-stable' into 16.11.x 89/9789/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Fri, 8 Dec 2017 17:17:23 +0000 (17:17 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Fri, 8 Dec 2017 17:17:27 +0000 (17:17 +0000)
commit1754d8e45ba3f8b13484dee3c2b8ac4d845f2b74
treedb372b59e29883bab5802c65b462c38a01b7b33a
parentfc42933813b2ba541bed9ef6b3e616dbf4b762ec
parent47d9763a1dd3103d732da9eec350cfc1cd784717
Merge branch 'upstream-16.11-stable' into 16.11.x

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