[dali_1.2.11] Merge branch 'devel/master' 16/93316/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:09:30 +0000 (15:09 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:09:30 +0000 (15:09 +0100)
Change-Id: I0636427349cd0c80e4b129e6822eb7affbacff8e


Trivial merge