Merge branch 'tizen' into mw
authorJuYoung Kim <j0.kim@samsung.com>
Mon, 29 Sep 2014 12:34:28 +0000 (21:34 +0900)
committerJuYoung Kim <j0.kim@samsung.com>
Mon, 29 Sep 2014 12:34:28 +0000 (21:34 +0900)
commit82fc288779095ecb09645b3a72abb5c8c1452a76
tree3c2c1e0ea169aeef53040416dafbddb134e00f48
parent94fb8507fe0a0d10914658b751e10bbd3c88f8c8
parent1da5fbc6d953ca4e8536a07e0ba6dd27dd45c91e
Merge branch 'tizen' into mw

Signed-off-by: JuYoung Kim <j0.kim@samsung.com>
Conflicts:
package/changelog
package/pkginfo.manifest
package/changelog