Merge branches 'tizen' and 'tizen_4.0' 67/161267/1 tizen_4.0_tv accepted/tizen/4.0/unified/20171207.070809 submit/tizen_4.0/20171206.144625 tizen_4.0.IoT.p2_release
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Wed, 22 Nov 2017 10:37:53 +0000 (11:37 +0100)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Wed, 22 Nov 2017 10:37:53 +0000 (11:37 +0100)
commit9682ce95dd4a079511c225be2839d93af4ecdc69
tree84d4ae4b827525da57324ad0fa9fe6bccf6e8cad
parent40b139332568707e7f2009c997cc21a0f29ac326
parent3874f0f942a1a22ce0ceb8e1799133f085536c27
Merge branches 'tizen' and 'tizen_4.0'

Change-Id: I0e30db44df252ac6a5629542dfd9cea022a04971