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


Trivial merge