[dali_1.2.49] Merge branch 'devel/master' 54/140054/1
authorDavid Steele <david.steele@samsung.com>
Fri, 21 Jul 2017 13:25:13 +0000 (14:25 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 21 Jul 2017 13:25:13 +0000 (14:25 +0100)
commitf53544840aee4f3443c5bee983dcb3e9caad8907
treed04c66c913b30049195eee9e84a49c7444888c23
parente6b609379c70721580d03e308dc68c4b37e7ee2e
parenteecec9f4c32a08b1c7cecf81d14157d5587db137
[dali_1.2.49] Merge branch 'devel/master'

Change-Id: I078e6f5181b3791638ff61105088b4dd796aedca