Merge branch 'tizen' into mw 54/29454/1
authorseokgil.kang <seokgil.kang@samsung.com>
Tue, 28 Oct 2014 05:48:45 +0000 (14:48 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Tue, 28 Oct 2014 05:48:45 +0000 (14:48 +0900)
commit0a62f53a5cd6645235de05e093b2dbafea0d827d
treea271e0d927195d5a9df270f5c29c1e1c8cc6b2ad
parentc299f0721c5dbe78cb4ee84247a6fb9cae26d163
parentf13f92841aac8065926d3c2408abfe45252cda28
Merge branch 'tizen' into mw

Conflicts:
package/changelog

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