[dali_1.3.3] Merge branch 'devel/master' 40/163340/1
authorDavid Steele <david.steele@samsung.com>
Fri, 8 Dec 2017 14:34:09 +0000 (14:34 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 8 Dec 2017 14:34:09 +0000 (14:34 +0000)
commitf239ed3057d35078c92adf007ea263942a4f2650
tree227440487805ab2345d75630299c146c351780aa
parentcf8d48f226806fe895cbec61b085d79c2f7a56fd
parentfd52d180063a3ed49da700420d9dac4c51ae0ce8
[dali_1.3.3] Merge branch 'devel/master'

Change-Id: Idb2ca961f0f0c030b0018cac31ff72a8891ba47d