[dali_1.3.11] Merge branch 'devel/master' 22/169822/1
authoradam.b <adam.b@samsung.com>
Fri, 9 Feb 2018 11:09:14 +0000 (11:09 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 9 Feb 2018 11:09:14 +0000 (11:09 +0000)
commit13511f4c94daa557d573c5a58b18970c14c8d520
tree80b25918dfb9c90517229fbc23360b808d38a69a
parent11e160726b35fb762e7dd80b679a60cfb8b4e1e6
parent027e7052dea527ff91abb949e67b0019ca28bb51
[dali_1.3.11] Merge branch 'devel/master'

Change-Id: Ic31ded1a95913754c002308339ab028325431b47