[dali_1.2.40] Merge branch 'devel/master' 30/130230/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:43:59 +0000 (13:43 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:43:59 +0000 (13:43 +0100)
commit502ac9a97635e43f801a67017ac33b33ce96109d
tree1998274fceb61c261fe76f58cff89a6aa1836ccf
parent031055493575e669299fe916e87c06bc41cb4b17
parent8addb07b2d52772045a1e9674780e3f32b5ddb0d
[dali_1.2.40] Merge branch 'devel/master'

Change-Id: Ic31d54afe7e25a14d8711a159dbcabec767d1897