[dali_1.3.3] Merge branch 'devel/master' 39/163339/1
authorDavid Steele <david.steele@samsung.com>
Fri, 8 Dec 2017 14:33:55 +0000 (14:33 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 8 Dec 2017 14:33:55 +0000 (14:33 +0000)
commit841cec182d26fa3b89d7a353fb0b5dde194779d0
treea80f7bbf711f7b4330af058c3d37069b1b38c5f9
parent14a48afd7d9b5ba7bd8c8ebc69b214be8310613a
parentbe7ed6eedc2b7f6652f280b0e2a55a9b499a9663
[dali_1.3.3] Merge branch 'devel/master'

Change-Id: I569ff9763c98f8eca5f5c97f71a5b70f7aca5a7d