[dali_1.2.31] Merge branch 'devel/master' 28/119628/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 17 Mar 2017 16:15:55 +0000 (16:15 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 17 Mar 2017 16:15:55 +0000 (16:15 +0000)
commit0e7b5f3cd5949d165850de59d0c3c1cff78f38a5
tree0f759bdf1d7551332b336980746df2815316ea53
parent6e5768771c9f9e0667ad8f61430135b7b61bbcab
parent5d2e92f0682a88ffccc0eb30699e86e680611628
[dali_1.2.31] Merge branch 'devel/master'

Change-Id: Ia9cbdca84c70ac9b62df624a2c61060d66b43d06