[dali_1.2.48] Merge branch 'devel/master' 83/138983/1
authoradam.b <adam.b@samsung.com>
Fri, 14 Jul 2017 12:29:59 +0000 (13:29 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 14 Jul 2017 12:29:59 +0000 (13:29 +0100)
commite6b609379c70721580d03e308dc68c4b37e7ee2e
tree1c7a9f0dc61ec51741167426cef79aaa543a7b30
parentc6580d2c8c865851d103856b0a9180bc1bd3469c
parent047770d458bac8e96c24fe629ee1562642850f3f
[dali_1.2.48] Merge branch 'devel/master'

Change-Id: I47b0720a5762fd9bf200a85c8c48983db110820a