[dali_1.2.2] Merge branch 'devel/master' 81/84581/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 10:00:08 +0000 (11:00 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 10:00:08 +0000 (11:00 +0100)
commit27833bb592e5b8a271f12754dee5f1836becab51
tree0fc97e9eb439b2106fd7324a66ee83a426d1ec5c
parent80f435f8608fa1604f597a5620c9e6ea137f8e0a
parentbafae52a34ef41e398758bef7c0e598ee77d8f4c
[dali_1.2.2] Merge branch 'devel/master'

Change-Id: Ia4c85347ab31c11c89a5d9fedca2103fab6d1f43