Merge branch 'tizen_2.1' into tizen_2.2
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Jun 2013 02:07:51 +0000 (11:07 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Jun 2013 02:07:53 +0000 (11:07 +0900)
commit18a7d330c7198938e830f9d53fd9cd3d4a47672e
treeeb5819f7de31763d154400aecbd103b799960774
parent7ab43c03b6ed9a31bb0fa38cb6bb7fd2a64c3254
parenta5959a0e1b3a78ccbc82e3854af6f320b6bd1673
Merge branch 'tizen_2.1' into tizen_2.2

Change-Id: I8cb9262a06e29b5916466552799c426554d250b3