[dali_1.1.17] Merge branch 'devel/master' 73/57173/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:12 +0000 (14:41 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:12 +0000 (14:41 +0000)
commit04a3e8019ce7c8c038fa632fa6b7cb0483f1d760
treeaa63350345931239ecca97484641afad6b310fe3
parent080a95b6bf04c37f39579ed80037e1a4f7bab7d7
parent8174e0afc420d21a6297afdd0d6f796b02ccddf4
[dali_1.1.17] Merge branch 'devel/master'

Change-Id: I74b46d605e6e990cb842aa4788286c1f33c1f88c