Merge branch 'tizen', remote-tracking branch 'upstream/master' master
authorhwajeong.son <hwajeong.son@samsung.com>
Thu, 4 Oct 2018 02:19:58 +0000 (11:19 +0900)
committerhwajeong.son <hwajeong.son@samsung.com>
Thu, 4 Oct 2018 02:19:58 +0000 (11:19 +0900)

Trivial merge