[dali_1.1.6] Merge branch 'devel/master' 33/49233/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 9 Oct 2015 09:49:03 +0000 (10:49 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 9 Oct 2015 09:49:03 +0000 (10:49 +0100)
commit4351264e95b186ab1f9294bca188ea9a9863cb9e
tree55740702cd0ea3dda2b997f1e22b475f3f63a3cf
parent40efdf984503da25ff348e5ce7092bde00b81d1d
parent4149dbb53cbcd16569ed2673252bb5c31012cd3c
[dali_1.1.6] Merge branch 'devel/master'

Change-Id: Ic9330a61e6e11bc53e39a1c9e8faa6c72da30dfe