[dali_1.1.21] Merge branch 'devel/master' 15/59315/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Feb 2016 10:33:02 +0000 (10:33 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Feb 2016 10:33:02 +0000 (10:33 +0000)
Change-Id: I57c848e415a6d08ce9ea20dcbc6744d065f6a048


Trivial merge