[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)
commit7c8b97b68dd1e90533ce8b8da3b074fccf8285d7
tree4782210f23e6eb7edb6be19102279f0641014726
parentd14fbe3a8fad2141cf06c4589c58cc615ba3be80
parentc473bdf4835a99ae82b0a899a739e4631f46c771
[dali_1.1.21] Merge branch 'devel/master'

Change-Id: Id137cbb4ac3a596ca7ef8d2b32c5889dd867202b