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


Trivial merge