[dali_1.2.1] Merge branch 'devel/master' 50/83850/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:36 +0000 (11:41 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:36 +0000 (11:41 +0100)
commit80f435f8608fa1604f597a5620c9e6ea137f8e0a
treefa9bae9318194fa2f45a4ba40e3133460c4bbae7
parent4c9152e53ad2cc0f85c35288599c103192ed98d6
parent041f00e9d62fe0e0c236f182b521213ca370c5f2
[dali_1.2.1] Merge branch 'devel/master'

Change-Id: I911142b201fcc91fecf8554c9dd441a706103ebe