Merge remote-tracking branch 'messaging/tizen'
authorWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 01:04:19 +0000 (10:04 +0900)
committerWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 01:04:19 +0000 (10:04 +0900)
Change-Id: I78d17674dad1b96e1d92d371af6b0c686fbd6964


Trivial merge