Merge "Replace deprecated keywords"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 15 Jun 2016 15:58:01 +0000 (15:58 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 15 Jun 2016 15:58:01 +0000 (15:58 +0000)

Trivial merge