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


Trivial merge