[dali_1.2.62] Merge branch 'devel/master' 08/156908/1
authorRichard Huang <r.huang@samsung.com>
Fri, 20 Oct 2017 11:44:09 +0000 (12:44 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 20 Oct 2017 11:44:09 +0000 (12:44 +0100)
Change-Id: Ieb515050b3f47ac57d4764c956f2248872c24afa


Trivial merge