[dali_1.2.14] Merge branch 'devel/master' 63/97263/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:40:58 +0000 (18:40 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:40:59 +0000 (18:40 +0000)
Change-Id: Ie3ffed75c9ae34aae54543f05e8f6a9a40f68305


Trivial merge