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


Trivial merge