[dali_1.1.39] Merge branch 'devel/master' 28/75328/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 17 Jun 2016 10:44:07 +0000 (11:44 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 17 Jun 2016 10:44:07 +0000 (11:44 +0100)
commit85a8d2f083ab3660c07098c90e2dc9c05f7c187c
tree8d0ef5441e71a50d92451866a1f92f1943144cc1
parent0acf86940102760a173238655fa8449d955c567d
parent62a49b42b22cf44459cfc1d1ab9ed014568b9e87
[dali_1.1.39] Merge branch 'devel/master'

Change-Id: I9abdb89a2a9727dbd4b27cfaffc15a4c68d499dd