Merge branch 'master' into notification-service
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)
commit5d0c9be426113ad25185853ac72593b582717382
tree54bcebd1f7b33f7a5bd9802447f93a4781cb2c81
parentbf80455a7426c16d1f899909d5ff2b3291427526
parentb15643413083b95ed08c706a3fe1d8a83600ee83
Merge branch 'master' into notification-service

Update latest master changes into notificaton-service branch

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