[dali_1.2.9] Merge branch 'devel/master' 62/91462/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:34:07 +0000 (16:34 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:34:07 +0000 (16:34 +0100)
commit40844807e7258f1e5d9ef1a3650f438c8777409c
tree247174b32dcb2f1d7113cf210ac4045a73219aba
parent3e882d1a8dc3fbaa4f1f671e1d1da4d878ec04b6
parent5296ad5a02b4bfe743b53d6d7b666b8c8a8e59a6
[dali_1.2.9] Merge branch 'devel/master'

Change-Id: I22f7ca621b2329dc94c445a3330a646bc6d585c5