[dali_1.2.54] Merge branch 'devel/master' 50/146250/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:46 +0000 (11:49 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:46 +0000 (11:49 +0100)
commitc75a505d707cb81219f9fff043a5dea4b2fe6fbe
tree3e42224abeedb1a91c6ffe7adeb959e4dc2d7be1
parentea8d5e7931fcbcf33c4dc03de26f8c169402b217
parentbf04ade003514e639ab055720f41b2b61db76cb6
[dali_1.2.54] Merge branch 'devel/master'

Change-Id: I161c0e2e5bc243c65be2c29332b17392d432e786