Merge "Fix a bug in test." stable/brahmaputra
authorRuan HE <ruan.he@orange.com>
Wed, 16 Dec 2015 17:02:56 +0000 (17:02 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 16 Dec 2015 17:02:56 +0000 (17:02 +0000)

Trivial merge