[dali_1.1.21] Merge branch 'devel/master' 14/59314/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Feb 2016 10:32:57 +0000 (10:32 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Feb 2016 10:32:57 +0000 (10:32 +0000)
Change-Id: Id137cbb4ac3a596ca7ef8d2b32c5889dd867202b


Trivial merge