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


Trivial merge