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


Trivial merge