Merge branch 'master' into notification-service
authorHun-je Yeon <hunje.yeon@samsung.com>
Mon, 25 Jul 2016 11:08:05 +0000 (20:08 +0900)
committerHun-je Yeon <hunje.yeon@samsung.com>
Mon, 25 Jul 2016 11:38:16 +0000 (20:38 +0900)
Change-Id: Iae884afc5a68ccf650ac758191cbb504973705cb
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>

Trivial merge