[dali_1.1.17] Merge branch 'devel/master' 72/57172/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:07 +0000 (14:41 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:07 +0000 (14:41 +0000)
commit4c7778a7923dd5a76d664bd6f4d474a991727628
treedc7cb40bb664724eaa3573eb0791223ed1a7a469
parentd014bb2b98d62e80d0fa1d37ce5b578ce980bf3a
parent70a082badc51cc2bbc0b01736ae377953b98f55d
[dali_1.1.17] Merge branch 'devel/master'

Change-Id: I530546655e101410938ea31a13a90008db2f69fc