[dali_1.2.40] Merge branch 'devel/master' 32/130232/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:44:19 +0000 (13:44 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:44:19 +0000 (13:44 +0100)
commit0ee36c9ea82c061d8306bdd2c5bf99b9089bd631
treecfff5d47e5201c55459dbdc1992f11fa2f1533f0
parentd83ad9c44e949249ef76c20b2379b0c7cec6d4a4
parent59a174211013935b47c64149e5c0788620b333e0
[dali_1.2.40] Merge branch 'devel/master'

Change-Id: Ia9e79d501711ea2deacb5bb2c18e8b67f39f2993