[dali_1.1.8] Merge branch 'devel/master' 14/50514/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 29 Oct 2015 10:32:33 +0000 (10:32 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 29 Oct 2015 10:32:33 +0000 (10:32 +0000)
commitd23654c73e240cb25c8e22778793ccabf0affb77
tree541fdabfc2383a3fff34af2c6e2deb6016aeb1d5
parentfc74c49e34fbe0ba1dc3c5d86302e5cd3436e2ac
parentc782943e5725e287446f232e5ab11c1ea16928dc
[dali_1.1.8] Merge branch 'devel/master'

Change-Id: I0a13417c13f05c2e20da7bfda68fff7ce0fbdab8