[dali_1.1.6] Merge branch 'devel/master' 36/49236/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 9 Oct 2015 09:49:23 +0000 (10:49 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 9 Oct 2015 09:49:23 +0000 (10:49 +0100)
commiteaa55256641593c18c3480c843a11ae74effd0d5
tree3133617f64a9765816ac14bfc53b1258f577f1c1
parent1abe9ed8c6629f34dee99ce6e4923a000851d334
parent99e4d9f4ec6c54eff5584db9fa9363bb8ba6a97f
[dali_1.1.6] Merge branch 'devel/master'

Change-Id: Idd8bc6beeb4fd5e1253ae19e6227abebd4883c18