[dali_1.1.36] Merge branch 'devel/master' 97/71897/1
authorRichard Huang <r.huang@samsung.com>
Fri, 27 May 2016 11:22:01 +0000 (12:22 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 27 May 2016 11:22:01 +0000 (12:22 +0100)
commit10f86c69033974fcf4e9bec31036099b55f8a403
tree4bb530a5e806edaca93df8c27e067cef7a893476
parentefa341d5ca5e10b93499358cb38c19aa2b1fef80
parent50858ef7ee3eb48eccec3570d18febcebee44c0e
[dali_1.1.36] Merge branch 'devel/master'

Change-Id: I67e2b3f98a4c983f5e7b73bfae81ebd79bcf61d3