Merge branch 'tizen_2.1' into tizen_2.2
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Jun 2013 02:04:44 +0000 (11:04 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Jun 2013 02:04:55 +0000 (11:04 +0900)
commit04e988f25ee3ab65e7c63c5eb6875ef174bb5b82
tree78c5a9484f904318d57eef4bbaaa0a9acec65ce4
parentdca2732e61f1fa9b781b754b77fa07fcd830a263
parent2c2e2201c3691934d69ff4fbf7094295359d10d8
Merge branch 'tizen_2.1' into tizen_2.2

Change-Id: Icdd49054d9092107b5a665156eab743603215e54