[dali_1.2.0] Merge branch 'devel/master' 74/82774/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 5 Aug 2016 13:52:41 +0000 (14:52 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 5 Aug 2016 13:52:41 +0000 (14:52 +0100)
commit4c9152e53ad2cc0f85c35288599c103192ed98d6
tree5f8eca5bf5231aa719f2aefa268c2b5249f45dac
parent146486a8c7410a2f2a20a6d670145fe855672b96
parent707333599e29423db3bf26b945f35bb3070897e0
[dali_1.2.0] Merge branch 'devel/master'

Change-Id: I1f5659b60490f5d4d8e7c74ac4d6c7b774861be7