[dali_1.2.59] Merge branch 'devel/master' 90/153790/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 29 Sep 2017 12:20:08 +0000 (13:20 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 29 Sep 2017 12:20:08 +0000 (13:20 +0100)
commit6878b6a46c51814c7ae4096980ffd6700cdd2a69
treef6471ce5eca2dd7f6e3f97139035296411174a35
parent6eb8e8d6a13e5d361cfa97f6a87e3c43f6032118
parent4f966a2e9c6851aa2c736b0081d99ce679cc0db8
[dali_1.2.59] Merge branch 'devel/master'

Change-Id: Ia1a97ec905d416989ebfc9290951ee8e3d56aaaf