[dali_1.2.58] Merge branch 'devel/master' 83/151983/1
authorDavid Steele <david.steele@samsung.com>
Fri, 22 Sep 2017 14:24:23 +0000 (15:24 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 22 Sep 2017 14:24:23 +0000 (15:24 +0100)
commit6eb8e8d6a13e5d361cfa97f6a87e3c43f6032118
tree28ae039938c939ad0d1d0afb3f8d51e50fbcd436
parentd8dacbc930312acccf0f89cc69adb033ad7ae1a3
parent320ae8c88ae2b643fc233a949a7ffd9ad219fcbe
[dali_1.2.58] Merge branch 'devel/master'

Change-Id: Id334177fba91cb82fc140e5c861c2978eb920219