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)
commit2fe1c5ea6741015a119958911e34613f4852c175
tree5bac56a90270aca55595b9880be023ee946efd49
parentb79f9b6f3531a81e2a447800ef3f03f02b314961
parent7d27c1850d700e01dcdf7ede71f4e2f75c8fea28
Merge branch 'master' into notification-service

update the master changes into notification-service.

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