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


Trivial merge