Merge "Fix ico-uxf-homescreen/murphy conflict" into tizen rev_0.3
authorRonan Le Martret <ronan@fridu.net>
Mon, 20 Oct 2014 13:55:00 +0000 (06:55 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 20 Oct 2014 13:55:00 +0000 (06:55 -0700)
commit1a47064b0f53052c42c79f73906b55b7fa5abada
tree522268c4f6fb80badeb2b93e301f6111735779dc
parent74e280812193fad8eb99c1b6f1a9e14be32afafc
parenta1d312bc2338766dcb56b76f7c49e6c2da0df35a
Merge "Fix ico-uxf-homescreen/murphy conflict" into tizen