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


Trivial merge