[dali_1.2.14] Merge branch 'devel/master' 62/97262/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:40:47 +0000 (18:40 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:40:47 +0000 (18:40 +0000)
commit57d1b821320145a6c0e5e22c3759a62aaf70a5de
tree5c13db8a0f65d1afc14db643a487610c437f614b
parent444b3467d73e1ffbcacc13acee08895cd183638a
parentce18537ec69dbde7885f8603d72831bb37acde07
[dali_1.2.14] Merge branch 'devel/master'

Change-Id: I8d624755a54eb42a25aa887bd1faa6e5564f74d9