[dali_1.1.6] Merge branch 'devel/master' 35/49235/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 9 Oct 2015 09:49:17 +0000 (10:49 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 9 Oct 2015 09:49:17 +0000 (10:49 +0100)
commit10967b843a1ab64b10f8a8e1c7757657b9ddba9a
treee5bf54c3fa8954e669adea3c3409a0918bb5eff9
parentcdd369d89e13e0d972309eebf4fe5ecb57e5dd84
parentaa12120a367cd45be2bf96ef329998ace287ebf6
[dali_1.1.6] Merge branch 'devel/master'

Change-Id: I1d00c300da2b1b3fd986f4752a7a4d8531ffb576