[dali_1.2.31] Merge branch 'devel/master' 31/119631/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 17 Mar 2017 16:16:29 +0000 (16:16 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 17 Mar 2017 16:16:29 +0000 (16:16 +0000)
Change-Id: I509ddb6225654922657915b3dca17cd1fe26b1ad


Trivial merge