[dali_1.2.17] Merge branch 'devel/master' 84/101984/1
authoradam.b <adam.b@samsung.com>
Fri, 2 Dec 2016 14:08:36 +0000 (14:08 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 2 Dec 2016 14:08:36 +0000 (14:08 +0000)
commiteb237d3531280007d6518e763dac1c3f34805741
treed545953d8b4810a67710be736aa0f1bb1a84e577
parentc6fe710150fe1e7993354a87fb6a75399c3f321f
parent5fb28e6d247ccc7f9ce1088320b034bd68167728
[dali_1.2.17] Merge branch 'devel/master'

Change-Id: Id5e00b29b13071852d97bd05062cf65f41b57ce3