Merge "integrated performance and monitor into menu"
authorTao Shen <shentao@chinamobile.com>
Wed, 19 Apr 2017 12:24:54 +0000 (12:24 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 19 Apr 2017 12:24:54 +0000 (12:24 +0000)

Trivial merge