[dali_1.1.26] Merge branch 'devel/master' 27/62827/1
authorRichard Huang <r.huang@samsung.com>
Fri, 18 Mar 2016 13:10:35 +0000 (13:10 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 18 Mar 2016 13:10:35 +0000 (13:10 +0000)
Change-Id: Ibad56390f405b7d4faf6a05dd6e07930383f8a2d


Trivial merge