[dali_1.2.48] Merge branch 'devel/master' 84/138984/1
authoradam.b <adam.b@samsung.com>
Fri, 14 Jul 2017 12:30:05 +0000 (13:30 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 14 Jul 2017 12:30:05 +0000 (13:30 +0100)
commit3994a8fa38310fc7dd7bbfbf37c982cea8d199da
tree3a428e6797166278d2e1ad9390a1933dee808e79
parent8a9116228d9892ebe944340321a8b6fcd9828bcc
parent362f07d9dd85cac9a32b7029c109d5a6d3fb8e5e
[dali_1.2.48] Merge branch 'devel/master'

Change-Id: I26926e88e5f652be0f3c8c3072c94aa4cf8fca78