Merge "Fix configuration names."
authorRuan HE <ruan.he@orange.com>
Mon, 23 May 2016 18:05:59 +0000 (18:05 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 23 May 2016 18:05:59 +0000 (18:05 +0000)

Trivial merge