Merge branch 'tizen' into mw
authorJuYoung Kim <j0.kim@samsung.com>
Fri, 19 Sep 2014 23:56:17 +0000 (08:56 +0900)
committerJuYoung Kim <j0.kim@samsung.com>
Fri, 19 Sep 2014 23:56:17 +0000 (08:56 +0900)
commit762dcc03fa0e885498ab0868b43f982afc9a60b2
treeb02de8a25fad12788f72ea9a5dea540c5c82f325
parentbcf0f5c72d6238ec81850aae056077de93348173
parent1ff3e0273562596d5b3d14bfb8c704b7e2c0fe77
Merge branch 'tizen' into mw

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

Change-Id: Ia9fb050bd2200c3fca745f73dc0c842dc32526f8