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


Trivial merge