Merge "Initial code import"
authorHuabing Zhao <zhao.huabing@zte.com.cn>
Sat, 13 Aug 2016 09:04:30 +0000 (09:04 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Sat, 13 Aug 2016 09:04:30 +0000 (09:04 +0000)

Trivial merge