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


Trivial merge