[dali_1.2.28] Merge branch 'devel/master' 51/116451/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 24 Feb 2017 09:34:49 +0000 (09:34 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 24 Feb 2017 09:34:49 +0000 (09:34 +0000)
Change-Id: I71502e37b400ab8a9c5dc33878072c532ba81128


Trivial merge