[dali_1.2.54] Merge branch 'devel/master' 49/146249/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:33 +0000 (11:49 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:33 +0000 (11:49 +0100)
commitd9556f0576ca28a4d1189fa3b09fed0333a4bd49
tree70370064415c0ef36d45b3df060d2d506062599b
parent6679346de127fe5a504299789fb933e89fe2bb01
parentb26dd9c746eeb66b7011b506222d87d9fd89cf3c
[dali_1.2.54] Merge branch 'devel/master'

Change-Id: Ifaa7589fc7fc57066a9957cf1ce06ba19057f4cc