[dali_1.2.60] Merge branch 'devel/master' 40/154140/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Oct 2017 15:55:40 +0000 (16:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Oct 2017 15:55:40 +0000 (16:55 +0100)
commit8b8df4bd98ecbf5226c2f06d477aec784d326860
treee07165168254e6b588717e628ca98a3b114a956b
parentd83929a26671bef443aeb9ca3de1fbb185cc62aa
parent75137815e46a655baeec4eba8c67009462206625
[dali_1.2.60] Merge branch 'devel/master'

Change-Id: I64b3eb9bf57d879c6bebb8f8b128e268ac0957c7