[dali_1.2.20] Merge branch 'devel/master'
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Dec 2016 10:46:43 +0000 (10:46 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Dec 2016 10:46:43 +0000 (10:46 +0000)
Change-Id: Ib13b9cd336cd80eac82878063dcb8ed3cee848ec


Trivial merge