[dali_1.1.31] Merge branch 'devel/master' 71/66971/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:20 +0000 (10:08 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:21 +0000 (10:08 +0100)
commitcac8a7188128758ad1149bd05099c429c6aac6ef
treea554b445233c797e4b5ff05e50132444dd83aacc
parentc0580aca6b1a109865a84f7dc17f033ff2ca50c6
parenteb1c9467ea8f1f5c6dc4dc7c519f499cbfb623f4
[dali_1.1.31] Merge branch 'devel/master'

Change-Id: I917c81f226465bda2f540b2e7e9ddefece9c210f