Merged from tizen 2.4
authorKyuho Jo <kyuho.jo@samsung.com>
Wed, 25 Mar 2015 00:47:06 +0000 (09:47 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Wed, 25 Mar 2015 00:47:06 +0000 (09:47 +0900)
commit9a7a35b3956432ce787e41cbf1220386f126a317
treecd271fc1f8c5981ca83c70d73d187c4be39f2d7d
parent9cb1a7bd8bccd1b8d9714fcd7ad1a0c6cdad8bc0
parentfc1f18f0a8901c5bd6bd2e9456c9461824cd485b
Merged from tizen 2.4

Change-Id: I9bb441bdf9d66241f7feab9a53bd438689c4cf3d
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>