Merge "Merge branch 'group-manager'"
authorUze Choi <uzchoi@samsung.com>
Mon, 7 Mar 2016 05:49:37 +0000 (05:49 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Mon, 7 Mar 2016 05:49:38 +0000 (05:49 +0000)

Trivial merge