[dali_1.3.6] Merge branch 'devel/master' 71/166071/1
authorRichard Huang <r.huang@samsung.com>
Fri, 5 Jan 2018 13:33:19 +0000 (13:33 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 5 Jan 2018 13:33:19 +0000 (13:33 +0000)
commit636bc3cbd9618e1c233134a4e9172067a31cf741
tree010bd2ff569aafe4c8d9c21e5e7ab12653b87a5c
parentac1b8c3842901eb74060fb940195045af9831d0a
parent6809b59bf54c2ca2a5c22a29149ad2648318eeca
[dali_1.3.6] Merge branch 'devel/master'

Change-Id: I0bad35e3480793cbb3d8df361a4ea2bfd3def804