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)
commit2da05009b32eef85c3376314ee7e4d91097e79fb
tree0d517e8c04e7c32fa6bbe5176bfbf66ab209cd66
parentbb93e3a07afd2126aa7665c4c56de50e2a1c9bfa
parent61ff7411a690309b4832e1e639689f30b0e4b8e8
Merge branch 'master' into group-manager

Change-Id: Ib338db12ec1ebf1fe5db365f998270200954481e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>