Merge remote-tracking branch 'iotcon/tizen'
authorWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 00:55:42 +0000 (09:55 +0900)
committerWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 00:55:42 +0000 (09:55 +0900)
Change-Id: I80a395ac2b6da8d9c362c49f98ab122bd057c7eb


Trivial merge