Merge branch 'upstream' into HEAD 82/8182/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Wed, 23 Aug 2017 13:47:51 +0000 (14:47 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 23 Aug 2017 13:48:05 +0000 (14:48 +0100)
commit41921c54b898292b0140d5f322cc8ec5b0642a7e
tree70c62f3b26536abf0fa4b347300c78360d4ff546
parent76f89ef557ff345dfa606e797e1765404babce56
parentf239aed5e674965691846e8ce3f187dd47523689
Merge branch 'upstream' into HEAD

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