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


Trivial merge