[dali_1.4.2] Merge branch 'devel/master' 01/197501/1
authorRichard Huang <r.huang@samsung.com>
Fri, 11 Jan 2019 12:39:55 +0000 (12:39 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 11 Jan 2019 12:39:55 +0000 (12:39 +0000)
commit731644428603a83179cdc6291bdaa4405b426c26
tree8ebf1cac1b20c0d042e4a76e0fe14be32c0ec30d
parent8a68f55cd1dc315fa0c9f75711b671a22840f5a5
parent752e2a1695a9b8d83b33634cab52d6c573924bf1
[dali_1.4.2] Merge branch 'devel/master'

Change-Id: I50b7552a523102c8c0596cb25fb127acdbf3bc4e