Merge "Modify some configuration for build"
authorTao Shen <shentao@chinamobile.com>
Wed, 22 Mar 2017 13:03:49 +0000 (13:03 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 22 Mar 2017 13:03:49 +0000 (13:03 +0000)

Trivial merge