Merge branch 'master' into group-manager
authorJihun Ha <jihun.ha@samsung.com>
Wed, 24 Feb 2016 09:02:12 +0000 (18:02 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Wed, 24 Feb 2016 09:02:12 +0000 (18:02 +0900)
Change-Id: I0116d6c7867e20b04007f820d8b936ef30150223
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

Trivial merge