Merge "test"
authorRuan HE <ruan.he@orange.com>
Fri, 19 Jun 2015 13:59:20 +0000 (13:59 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 19 Jun 2015 13:59:20 +0000 (13:59 +0000)

Trivial merge