[dali_1.2.23] Merge branch 'devel/master' 90/111490/1
authorRichard Huang <r.huang@samsung.com>
Fri, 20 Jan 2017 13:36:52 +0000 (13:36 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 20 Jan 2017 13:36:52 +0000 (13:36 +0000)
commit6e73d939b99ac4b32042d6c6104bdd8eddaebdfa
tree0fda6a9ffb3567bc198efa71f9d44af599e7f254
parent722927f43de36ff554c71dfa62318efef3752f1d
parent064dce1a3613f7208928be2f1342ad92d8fa0dcf
[dali_1.2.23] Merge branch 'devel/master'

Change-Id: Iac3212ae416f0bf313aedf670fefd7fb48276d3b