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


Trivial merge