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


Trivial merge