[dali_1.3.4] Merge branch 'devel/master' 38/164138/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:39 +0000 (11:19 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:39 +0000 (11:19 +0000)
commit9306ec108e7aa99a27ffd537406be6107020f781
treea6c77b8495b9087e0539ce0cf1447e4da785edd7
parent1973e77abda9fd1f33a7ed030de83c7e6ea57c8a
parent85a5bd7341a468f13d75259fdd051181154ef6b4
[dali_1.3.4] Merge branch 'devel/master'

Change-Id: I8b2c926831491d5d3ad2c01bc91bf0daf965a80f