[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)
commitf6ec3250398a090ebe9d53a62ea57296dea7c20d
treea6c9d8b0fca85c0dde2ed22f5222ee44e4042a9d
parentb48ffb3e7cae74d63f55ff1a5582e8c6b8c9f2b3
parenteb63bb220e20dbbb8490c0bd5cbf9581dabfdd55
[dali_1.2.11] Merge branch 'devel/master'

Change-Id: I0636427349cd0c80e4b129e6822eb7affbacff8e