[dali_1.1.34] Merge branch 'devel/master' 97/69497/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 13 May 2016 10:55:07 +0000 (11:55 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 13 May 2016 10:55:07 +0000 (11:55 +0100)
commit719bb2f6939effe2a07155544667789553105518
treea7eb6a58ef4b152b4bcef49f0609cd46de5db48f
parentfe734e2366230b39aec4063f1b07f567fc0523a6
parentfd4284751e07d77307d8bcc19dcd25ef16a36708
[dali_1.1.34] Merge branch 'devel/master'

Change-Id: Ie38acb99c0903fff424b87f45d1582d0d52d8bb3