[dali_1.2.19] Merge branch 'devel/master' 51/105451/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 16 Dec 2016 13:20:45 +0000 (13:20 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 16 Dec 2016 13:20:45 +0000 (13:20 +0000)
Change-Id: I39e7eb40479e1d3de75944d1cbe6f7f9ee645a23


Trivial merge