[dali_1.2.2] Merge branch 'devel/master' 80/84580/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 09:59:58 +0000 (10:59 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 09:59:58 +0000 (10:59 +0100)
commitdaac2c141b85129dadcece6ba92d12e36d5d86ab
treeb9defcd0f83babb8501e2ae3e1b1e4af4549da4f
parentcdcb983253af9ef387c1c2ecec248da744ebdd8b
parent2b19ec02ccf523f4a0b67973d1a9de241b42e6b4
[dali_1.2.2] Merge branch 'devel/master'

Change-Id: I9621d13767bfb5ca17d71764bac7c16500af5e49