Merge remote-tracking branch 'upstream/master' into tizen accepted/tizen_5.0_unified tizen_5.0 accepted/tizen/5.0/unified/20181102.021609 accepted/tizen/unified/20181005.012450 submit/tizen/20181004.024641 submit/tizen_5.0/20181101.000004
authorhwajeong.son <hwajeong.son@samsung.com>
Thu, 4 Oct 2018 02:44:24 +0000 (11:44 +0900)
committerhwajeong.son <hwajeong.son@samsung.com>
Thu, 4 Oct 2018 02:44:24 +0000 (11:44 +0900)

Trivial merge