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


Trivial merge