Merge "Resolve the merge conflict"
authorTao Shen <shentao@chinamobile.com>
Fri, 17 Mar 2017 03:59:13 +0000 (03:59 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Fri, 17 Mar 2017 03:59:13 +0000 (03:59 +0000)

Trivial merge