[dali_1.1.19] Merge branch 'devel/master' 48/58348/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:17 +0000 (11:34 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:17 +0000 (11:34 +0000)
commit912e891b33f2b3b10392094c57b17eefa560b1fa
treef57d96457050d8925ff8888959d0c10fcc04ee90
parenta0a33727b8aa3ba5f32d4541f07718151f9574af
parent8578a5c796227756f62f483066952ab9915dfc2b
[dali_1.1.19] Merge branch 'devel/master'

Change-Id: I48b20bc2e82d0e6ab23a5d3d8b1c3d14429edf6d