Merge remote-tracking branch 'origin/tizen' into mw 04/21004/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Wed, 14 May 2014 11:43:56 +0000 (20:43 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Wed, 14 May 2014 11:43:56 +0000 (20:43 +0900)
commitd4aee71d7cc4bfdc06b82eac320d78aff3a6da36
tree2346bd0608a60df25d37b1c5310af371a39bd37b
parenta9322d17e2158cbf6706fef4278c8015778175c6
parent4077e644b3365c0ec09f57e9c5909bc11f399ae0
Merge remote-tracking branch 'origin/tizen' into mw

Conflicts:
package/changelog

Change-Id: I5a87cc90b07160b6f688aab29e1b1cc1002cc813
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
package/changelog
package/pkginfo.manifest