Merge branch 'tizen_2.1' into tizen_2.2
authorwoo <s-w.woo@samsung.com>
Wed, 5 Jun 2013 09:46:11 +0000 (18:46 +0900)
committerwoo <s-w.woo@samsung.com>
Wed, 5 Jun 2013 09:46:42 +0000 (18:46 +0900)
commit4c2997d98a746f514921a987dd5c0f0bad75e725
tree8476c0d81eb08bd90f4f217512e4edded8a0a4d4
parent25e6ffe69ca8952e9534fc946ece3665c92eb483
parentca0c81b0cbad703360b35b4d24ca69b67d55a1a7
Merge branch 'tizen_2.1' into tizen_2.2

Change-Id: Ic91b8ab375454313e82807cd279210db551fe500