Merge "integrated monitor and performance functions"
authorTao Shen <shentao@chinamobile.com>
Wed, 19 Apr 2017 10:46:55 +0000 (10:46 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 19 Apr 2017 10:46:55 +0000 (10:46 +0000)

Trivial merge