[dali_1.2.13] Merge branch 'devel/master' 68/95768/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:15:49 +0000 (13:15 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:15:50 +0000 (13:15 +0000)
commit444b3467d73e1ffbcacc13acee08895cd183638a
treeead53a9fbce0e7deb78c096a2a56f02afd015168
parent0bea3bc41988b6b308bad87f019017b3a0e670b5
parentde58e61f6c1bca907f5a77efa2eedce95fd4c31d
[dali_1.2.13] Merge branch 'devel/master'

Change-Id: I0d21dc8d5e9ea46271403676ae22fd1359738a50