[dali_1.2.38] Merge branch 'devel/master' 95/128095/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:52:59 +0000 (10:52 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:52:59 +0000 (10:52 +0100)
commitffe860aa727b8e1bd33f7fe2c53f3daae993e076
treed9f2aa4de8ea5960ffd4f08117fb2556fd8a55bb
parent62403989c09a5cca87e061b59618c5bfc3dc899f
parent3cb8e6a33f15e320fce883304769c360292befbd
[dali_1.2.38] Merge branch 'devel/master'

Change-Id: I6695ac39d875d5f26f677855560ab673b04c262f