[dali_1.3.4] Merge branch 'devel/master' 39/164139/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:45 +0000 (11:19 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:45 +0000 (11:19 +0000)
commit5fa82acc87ca7de63ce715bb3cb63a12ac36fbcf
tree80bb0c80f98b5f041075d5c26b5680997ecfdf22
parent841cec182d26fa3b89d7a353fb0b5dde194779d0
parent09e5d267ec15575842fe20b9f331ed8a55cc57e2
[dali_1.3.4] Merge branch 'devel/master'

Change-Id: I10679ea694931c87d64accd9d6c67e31386393b6