[dali_1.1.2] Merge branch 'devel/master' 67/47967/1
authorRichard Huang <r.huang@samsung.com>
Thu, 10 Sep 2015 10:06:10 +0000 (11:06 +0100)
committerRichard Huang <r.huang@samsung.com>
Thu, 10 Sep 2015 10:06:10 +0000 (11:06 +0100)
commit243ad18f462d5c6b0d48ea13ff9918bcd9233e99
treec745b71333f3fca305a31e9742d3f76dc00a5c39
parent8da6b8a945b6a24dfa03f55ae4f2ad36e4bdf6f8
parent4699adbb4c0fe8e4593ad80d725c1e1158d0a6cd
[dali_1.1.2] Merge branch 'devel/master'

Change-Id: Ief4bf79343a635dade4f8fbe2d5ed5e449c9f5c1