[dali_1.3.34] Merge branch 'devel/master' 18/185318/1
authorDavid Steele <david.steele@samsung.com>
Fri, 27 Jul 2018 11:43:41 +0000 (12:43 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 27 Jul 2018 11:43:41 +0000 (12:43 +0100)
commitc09722b5d66f4df1c324cdfe90f0fe5426be2f14
treebb9d57c1a5e0510e27cbaf256dacf1faac00e8db
parent6f8d776cf278a43fecb8d8811b63a7239c8f4b10
parenta89e9f22c50d9a5d60a1584aa14719062c36d8a2
[dali_1.3.34] Merge branch 'devel/master'

Change-Id: Ief5f1d85d4d31663bbd7805028eaca2456973401