Merged from tizen 2.4
authorKyuho Jo <kyuho.jo@samsung.com>
Wed, 25 Mar 2015 00:48:10 +0000 (09:48 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Wed, 25 Mar 2015 00:48:10 +0000 (09:48 +0900)
commit5110ec9fd55085fba24b4da9a4df33ae4fbf123d
tree9b853db346504a78880852d04e6080dc21be4fcc
parent4436641d7105ceb863b2c747fea40e93480a1848
parent70c5dead923d36083329476a4054c94b4b53c5b9
Merged from tizen 2.4

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