[dali_1.2.24] Merge branch 'devel/master' 09/112209/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 27 Jan 2017 15:15:34 +0000 (15:15 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 27 Jan 2017 15:15:34 +0000 (15:15 +0000)
Change-Id: Ib48136cae5cd7066af9d30a196a7637e5199c6f8


Trivial merge