[dali_1.3.12] Merge branch 'devel/master' 79/170279/1
authorDavid Steele <david.steele@samsung.com>
Fri, 16 Feb 2018 13:56:47 +0000 (13:56 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 16 Feb 2018 13:56:47 +0000 (13:56 +0000)
Change-Id: I16db958ae9551c9e2bd671191152ba0749d411ac


Trivial merge