Merge "fix bug in controller.html remove useless function which is already removed...
authorjin xin <j00101220@huawei.com>
Mon, 31 Oct 2016 08:56:54 +0000 (08:56 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 31 Oct 2016 08:56:54 +0000 (08:56 +0000)

Trivial merge