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


Trivial merge