[dali_1.2.40] Merge branch 'devel/master' 31/130231/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:44:14 +0000 (13:44 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:44:14 +0000 (13:44 +0100)
commitc2c6ef4249c29f78bf92762137ec7b4eb7087ca6
tree093253102cede6b85df3320d821e7c77475017b1
parenta7201bd99105be97a0b3d84f671bf6d289ca9e0e
parent140d58838cc504653854a3b5034dcb81e9f6fcc0
[dali_1.2.40] Merge branch 'devel/master'

Change-Id: I1f0451276501e19b07c4805f45b7241b03887c2d