Merge branch 'master' into group-manager
authorJihun Ha <jihun.ha@samsung.com>
Mon, 15 Feb 2016 01:48:44 +0000 (10:48 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Mon, 15 Feb 2016 01:48:44 +0000 (10:48 +0900)
Change-Id: Ib338db12ec1ebf1fe5db365f998270200954481e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

Trivial merge