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


Trivial merge