Merge remote-tracking branch 'remotes/spin-harry/tizen_2.3' into develop
authorHyeongseok Heo <hyeongseok.heo@samsung.com>
Fri, 17 Apr 2015 10:10:23 +0000 (19:10 +0900)
committerHyeongseok Heo <hyeongseok.heo@samsung.com>
Fri, 17 Apr 2015 10:10:23 +0000 (19:10 +0900)
commitcbe565d71cc59792234376a2414e439b72e252d3
tree09334ba1aa7790fcdcae7267e38b832584e07b76
parentb01ebf9fffae4b3d08a2a15125a131d9b24a225a
parent34ced0a9b7cbebea4c9466207aef2de5642e5e04
Merge remote-tracking branch 'remotes/spin-harry/tizen_2.3' into develop

Conflicts:
package/changelog
package/pkginfo.manifest

Change-Id: I45d7a249d4e48130e29ce2ab39ab59e2dd5a58b5
Signed-off-by: Hyeongseok Heo <hyeongseok.heo@samsung.com>