Merge branch 'tizen_2.1' into tizen_2.2
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Jun 2013 02:05:31 +0000 (11:05 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Jun 2013 02:05:38 +0000 (11:05 +0900)
commitc75df5484c6b4321319b9a2e0691acf0b10843e0
tree14477e5c88fce1de436d99f0d2141797f1dd5f82
parent7771a735ed0865206a13b03ec2d9737068436918
parent00a70e74d7e309ebca00565b4a64f4f84545d898
Merge branch 'tizen_2.1' into tizen_2.2

Change-Id: I81528bb46496844da09c0b531ade3c208f311731