[dali_1.3.6] Merge branch 'devel/master' 72/166072/1
authorRichard Huang <r.huang@samsung.com>
Fri, 5 Jan 2018 13:33:35 +0000 (13:33 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 5 Jan 2018 13:33:35 +0000 (13:33 +0000)
Change-Id: I9a5de47b5d80d9036b8b8d38502378b36272fdb4


Trivial merge