Merge remote-tracking branch 'origin/master' into notification-service
authorcc <ch79.cho@samsung.com>
Thu, 8 Sep 2016 01:29:09 +0000 (10:29 +0900)
committercc <ch79.cho@samsung.com>
Thu, 8 Sep 2016 01:30:07 +0000 (10:30 +0900)
commite39b3483d5f9314a0e56b93afe69ad40c57747a4
treec784ce0a671c555b55bfe1891e00018bf3ae0b6d
parentb2e9024cecfff25cc830105228abea6ff4697a68
parent20aeee720d1c43b79810838eaa3abc15a6ec3ee0
Merge remote-tracking branch 'origin/master' into notification-service

Change-Id: I46af88cce1a821841baa1fe3f5226537ae1eb83b
Signed-off-by: cc <ch79.cho@samsung.com>