Merge branch 'tizen' into mw 06/23606/1
authorGun Kim <gune.kim@samsung.com>
Mon, 30 Jun 2014 09:06:17 +0000 (18:06 +0900)
committerGun Kim <gune.kim@samsung.com>
Mon, 30 Jun 2014 09:06:32 +0000 (18:06 +0900)
commit53df3eb38a8e2a4eea381ea5de9be0fc93f3a2bc
treed2099b689e1f4906c99ab54ad4dc8cbddfb19536
parentffa06fba43706b05af5419e21986c648d1bd61a4
parent834de3b46ef02cc5adb1bcac5b32550a854f57ec
Merge branch 'tizen' into mw

Conflicts:
org.tizen.nativeplatform/src/org/tizen/nativeplatform/PlatformProject.java
org.tizen.nativeplatform/src/org/tizen/nativeplatform/command/launcher/RemoteCommandUtil.java
org.tizen.nativeplatform/src/org/tizen/nativeplatform/coredump/CoredumpSelectionHandler.java
package/changelog
package/pkginfo.manifest

Change-Id: I7204881051e3b018b01378387e89700b532aafb1
Signed-off-by: Gun Kim <gune.kim@samsung.com>
package/changelog
package/pkginfo.manifest