Merge "Committer promotion: Serena Feng"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 31 Aug 2016 06:48:25 +0000 (06:48 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 31 Aug 2016 06:48:25 +0000 (06:48 +0000)

Trivial merge