Merge remote-tracking branch 'origin/master' into notification-service
authorHun-je Yeon <hunje.yeon@samsung.com>
Tue, 23 Aug 2016 03:55:18 +0000 (12:55 +0900)
committerHun-je Yeon <hunje.yeon@samsung.com>
Tue, 23 Aug 2016 03:55:52 +0000 (12:55 +0900)
commitc0fcafea39736b7e53c5506105dca8e8abda859e
tree9e0c72a61a632db8138146606f97ff13702daf75
parentbbc13314ed1d4f6d2154918da335f6ae085d144e
parente8640e6100da4f6eccc996720db41d2db5fab1ea
Merge remote-tracking branch 'origin/master' into notification-service

Change-Id: Ifc4d229deb7d96800790c617536d96b9ad25136c
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>