[dali_1.2.17] Merge branch 'devel/master' 83/101983/1
authoradam.b <adam.b@samsung.com>
Fri, 2 Dec 2016 14:08:24 +0000 (14:08 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 2 Dec 2016 14:08:24 +0000 (14:08 +0000)
commit769d8e2c71710cc33eb6512682887eb2a05a64d9
tree40a16657d7f53c0649d32e8cb4263680d3398f2a
parent5f58a4de80835daf8db03a9e6b9c04cf5f556831
parent602dc882b2947a93b353f7a8205d907aaa0ac987
[dali_1.2.17] Merge branch 'devel/master'

Change-Id: I326428d141c488906eaaadc7ea02a74bf4729e15