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)
Change-Id: I46af88cce1a821841baa1fe3f5226537ae1eb83b
Signed-off-by: cc <ch79.cho@samsung.com>

Trivial merge