[dali_1.2.54] Merge branch 'devel/master' 48/146248/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:26 +0000 (11:49 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:26 +0000 (11:49 +0100)
commit68a3f49a1d9baad56c9424e49e012436f307d14a
tree636fefbee6caf5c857e73f3cc0d12078fc8a4e73
parent3543b469e499cbcc53d21070a2f43cb2264eebfd
parent8b0e5f644b3af9bf711e3736dbb07978609aa0ba
[dali_1.2.54] Merge branch 'devel/master'

Change-Id: I584917fd6f5c31847b9ca29873256680ff6aa3a8