[dali_1.2.52] Merge branch 'devel/master' 42/143842/1
authorRichard Huang <r.huang@samsung.com>
Fri, 11 Aug 2017 11:45:17 +0000 (12:45 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 11 Aug 2017 11:45:17 +0000 (12:45 +0100)
Change-Id: Ic32572c24b43cd11e4a52d62e0886962a0987e91


Trivial merge