[dali_1.2.17] Merge branch 'devel/master' 81/101981/1
authoradam.b <adam.b@samsung.com>
Fri, 2 Dec 2016 14:08:06 +0000 (14:08 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 2 Dec 2016 14:08:06 +0000 (14:08 +0000)
commit23757de09d484bd019f758bc3a20e60e26a79456
treea04f348da62f0ef0a6ea5d987b62b3efe244511a
parentef140e55f7af7b05ef21fcd56dfc1b3f2bad3542
parent5d869f3665799e8d75d3ff92451cb3748c3ce49c
[dali_1.2.17] Merge branch 'devel/master'

Change-Id: I6bce8c6579791f5b8a2d44e6209c635de874183b