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)
Change-Id: I3902e34d97aa063f3ef7714e4409f854766c21cd
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>

Trivial merge