[dali_1.1.39] Merge branch 'devel/master' 29/75329/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 17 Jun 2016 10:44:13 +0000 (11:44 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 17 Jun 2016 10:44:13 +0000 (11:44 +0100)
commit9a36e256c115e4c7e63e6ded1e1a69b06963ccff
tree79a16c663fba5c0f86a5ec599fa97af27a3a5d32
parent3ef357cc431d17b7be772f0f74acb080feab123e
parentfc15ec07d0937a073085cfb763ba5d15c6ddbe1c
[dali_1.1.39] Merge branch 'devel/master'

Change-Id: Ida750827b2f72dfc8577de298f02b1f13585e57e