[dali_1.2.62] Merge branch 'devel/master' 05/156905/1
authorRichard Huang <r.huang@samsung.com>
Fri, 20 Oct 2017 11:43:32 +0000 (12:43 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 20 Oct 2017 11:43:32 +0000 (12:43 +0100)
Change-Id: I04727e1738dd61d6e67a91c467c9245e343e739b


Trivial merge