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


Trivial merge