[dali_1.2.52] Merge branch 'devel/master' 40/143840/1
authorRichard Huang <r.huang@samsung.com>
Fri, 11 Aug 2017 11:44:53 +0000 (12:44 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 11 Aug 2017 11:44:53 +0000 (12:44 +0100)
Change-Id: Ib1f6316cc48200aa0d69b9a6f75121e3baccf73a


Trivial merge