Merge branch 'tizen' into mw 66/27066/1
authorjungwook.ryu <jungwook.ryu@samsung.com>
Thu, 4 Sep 2014 05:11:13 +0000 (14:11 +0900)
committerjungwook.ryu <jungwook.ryu@samsung.com>
Thu, 4 Sep 2014 05:11:54 +0000 (14:11 +0900)
commit68db0e51248c751bbd4651443d6b41fdb1138efa
tree0d88ca3d4e940b3d4b46ad5175b32c0fe9eac7ef
parent042f1a0d9d79c197605de1eb39adf72fc7628a4b
parentc5b0d94237845eef51bf390dd4dcd0c1487ac3c6
Merge branch 'tizen' into mw

Conflicts:
package/changelog
package/pkginfo.manifest

Change-Id: I8affc55f4eae3ce5bf6a17da2e767f495e97f8a6
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
package/changelog
package/pkginfo.manifest