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


Trivial merge