[dali_1.1.17] Merge branch 'devel/master' 74/57174/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:22 +0000 (14:41 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:22 +0000 (14:41 +0000)
commit0e5a634c6f20855c76a6e2f63049db37fcbad965
treeb5ad1dc4ab5376f99297e84a58d25d6387bd138b
parentb8e4196609a3c6605702f2eb071f3e0d17fb6b9a
parent737021b0d5fc1f4b858aaa742fd7fbbc0a638492
[dali_1.1.17] Merge branch 'devel/master'

Change-Id: I532bbd312d2aa765254447d39f87fc7203b8bc44