Merge branch 'master' into group-manager
authorJihun Ha <jihun.ha@samsung.com>
Thu, 18 Feb 2016 00:37:01 +0000 (09:37 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Thu, 18 Feb 2016 00:37:01 +0000 (09:37 +0900)
commit0c159471888721fcfcb27e808d1f047cfabde570
treef96ab386794dc8e09fa1afe92ea9fe1480709101
parentcc5d61119fadb78cbe106d1304d33b214c7dfe02
parent8a6a1d3d9727c59dae609288ab7b26d17f5663d3
Merge branch 'master' into group-manager

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