Merge remote-tracking branch 'origin/master' into notification-service
authorHun-je Yeon <hunje.yeon@samsung.com>
Mon, 8 Aug 2016 23:41:11 +0000 (08:41 +0900)
committerHun-je Yeon <hunje.yeon@samsung.com>
Mon, 8 Aug 2016 23:43:49 +0000 (08:43 +0900)
commit4f9a573f29b6e3d77aff2d395076458fb24e9448
tree38078c2829050635fdbe2284062dfdb3892248f7
parent0c1157cd13a40a604cbd68c6d01f884bb06e9c1b
parentca7b728d3b6af54d7e6583b93f2312b4b4e0789b
Merge remote-tracking branch 'origin/master' into notification-service

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