[dali_1.1.1] Merge branch 'devel/master' 21/46821/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 26 Aug 2015 10:15:05 +0000 (11:15 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 26 Aug 2015 10:15:05 +0000 (11:15 +0100)
commit4730342337e4d3b3ed82bdb39b03cbdd6bda8854
tree2bcffb988b551098634c945975c271be71749d37
parentd01beb3f768adc89eb9256a65264f64901ee0df3
parent61d0cc0141c2842f273f1b18549ff627777a61f9
[dali_1.1.1] Merge branch 'devel/master'

Change-Id: I80cbe1cc286bd528de9c666b76ce288e14bdb785