[dali_1.2.54] Merge branch 'devel/master' 47/146247/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:10 +0000 (11:49 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:10 +0000 (11:49 +0100)
commitd413b2f6e70764c7f4620cf9bdb26419ff44d6ee
tree646253715913f8290a21091f8d2fd7906c3a4826
parent9cf50e730e420d4798dbf81a9dcd34a926f824e3
parente2f128212b8c23e4030032d5ff638c7df2b08e72
[dali_1.2.54] Merge branch 'devel/master'

Change-Id: I52501e27696182d960fa2e9917df3a30aba660de