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


Trivial merge