Merge branch 'master' into notification-service
authorHun-je Yeon <hunje.yeon@samsung.com>
Thu, 16 Jun 2016 13:02:09 +0000 (22:02 +0900)
committerHun-je Yeon <hunje.yeon@samsung.com>
Thu, 16 Jun 2016 13:03:29 +0000 (22:03 +0900)
update the master changes into notification-service.

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

Trivial merge