Merge branch 'tizen' into mw 18/26918/1
authorseokgil.kang <seokgil.kang@samsung.com>
Mon, 1 Sep 2014 10:48:11 +0000 (19:48 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Mon, 1 Sep 2014 10:48:11 +0000 (19:48 +0900)
commitcbaf23756ee0c5a7501dd3d320c4841acfc7b12e
treede7b630d81af73b919257f69a2f18e9174e9738d
parent0142a7bcbf36228ac6eaa1f8927bc3e40d8a4be8
parent1e8e7ed7f43e86f1a0247e2e0522ecf635c89bf4
Merge branch 'tizen' into mw

Conflicts:
package/changelog
package/pkginfo.manifest

Change-Id: Ief3c59d7e80cc6fb5a6ebae445f4160880d17ab4
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
package/changelog