Merge "update email address of Jerry Zhao" arno.2015.1.0
authorUlrich Kleber <ulrich.kleber@huawei.com>
Wed, 20 May 2015 13:35:21 +0000 (13:35 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 20 May 2015 13:35:21 +0000 (13:35 +0000)

Trivial merge