Merge remote-tracking branch 'origin/master' into notification-service
authorch79.cho <ch79.cho@samsung.com>
Fri, 19 Aug 2016 06:42:13 +0000 (15:42 +0900)
committerch79.cho <ch79.cho@samsung.com>
Fri, 19 Aug 2016 06:43:12 +0000 (15:43 +0900)
Change-Id: Ia655d39bb0e4a4c14072cb9a98566fe15bc4f6b1
Signed-off-by: ch79.cho <ch79.cho@samsung.com>

Trivial merge