[dali_1.1.18] Merge branch 'devel/master' 78/57778/1
authorRichard Huang <r.huang@samsung.com>
Fri, 22 Jan 2016 13:29:17 +0000 (13:29 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 22 Jan 2016 13:29:17 +0000 (13:29 +0000)
Change-Id: Ia0640a5556981c7e954515df3dee78217a24378b


Trivial merge