[dali_1.1.16] Merge branch 'devel/master' 99/56499/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 8 Jan 2016 14:33:16 +0000 (14:33 +0000)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 8 Jan 2016 14:33:16 +0000 (14:33 +0000)
Change-Id: I3e14d8c9bb75a75fda23dd85a97ffa910390193b


Trivial merge