Merge branch 'tizen' into tizen_4.0 62/168662/1 tizen_4.0_tv accepted/tizen/4.0/unified/20180131.050251 submit/tizen_4.0/20180130.060607
authorhj kim <backto.kim@samsung.com>
Tue, 30 Jan 2018 05:39:11 +0000 (14:39 +0900)
committerhj kim <backto.kim@samsung.com>
Tue, 30 Jan 2018 05:39:27 +0000 (14:39 +0900)
Change-Id: Ia731c998427f7d933ff5018ebac4d38bdbab01a5


Trivial merge