Merge branch 'master' into notification-service 65/10065/1
authorHun-je Yeon <hunje.yeon@samsung.com>
Fri, 5 Aug 2016 02:18:20 +0000 (11:18 +0900)
committerHun-je Yeon <hunje.yeon@samsung.com>
Fri, 5 Aug 2016 02:18:48 +0000 (11:18 +0900)
Update latest master changes into notificaton-service branch

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

Trivial merge