Merge "Use flavor name instead of flavor id"
authorMorgan Richomme <morgan.richomme@orange.com>
Fri, 27 May 2016 07:41:56 +0000 (07:41 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 27 May 2016 07:41:56 +0000 (07:41 +0000)

Trivial merge