[dali_1.2.64] Merge branch 'devel/master' 68/158868/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 3 Nov 2017 12:28:25 +0000 (12:28 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 3 Nov 2017 12:28:25 +0000 (12:28 +0000)
Change-Id: Ib8f3daa48e112a9ed5b9d1444c84168843046550


Trivial merge