Merge branch 'tizen' into tizen_studio_3.0_p5.0

Change-Id: I81f8f47088d13a25c0e768fd6c80dd9d569d76bb

diff --cc package/build.linux
index 3426f01d8f7356cbfd8416edd5c8b9a08d51ce00,012b6a0de4673bca7cb6773bc0e7aaedb3db70f0..395eabb81f4f898f76cc5e81c807b56b3db40840
--- 1/package/build.linux
--- 2/package/build.linux
+++ b/package/build.linux
@@@ -27,7 -27,7 +27,7 @@@ build(
  # install
  install()
  {
-       TIZEN_VERSIONS="4.0"
 -      TIZEN_VERSIONS="5.0 4.0 3.0"
++      TIZEN_VERSIONS="5.0"
        for VER in ${TIZEN_VERSIONS} ; do
                KERNEL_DIR=$SRCDIR/package/${VER}-emulator-kernel-x86.package.${TARGET_OS}/data/platforms/tizen-${VER}/common/emulator/data/kernel
                mkdir -p $KERNEL_DIR

diff --cc package/pkginfo.manifest
index 97a176e83ba1f814f922077fecb22198f388f856,6b203398bb77c60876fd5669dd8a8313d5bbe12d..905a5b9efd40a172d69ccfe069b9026bb16c9c08
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -7,7 -7,22 +7,3 @@@ OS: ubuntu-32, ubuntu-64, windows-32, w
  Build-host-os: ubuntu-64
  Description: Tizen x86 Emulator Kernel
  
 -Package: 4.0-emulator-kernel-x86
 -OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 -Build-host-os: ubuntu-64
 -Description: Tizen x86 Emulator Kernel
 -
--#Package: 4.0-emulator-kernel-arm
 -#OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 -#Build-host-os: ubuntu-64
 -#Description: Tizen ARM Emulator Kernel
 -
 -Package: 3.0-emulator-kernel-x86
 -OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 -Build-host-os: ubuntu-64
 -Description: Tizen x86 Emulator Kernel
 -
 -#Package: 3.0-emulator-kernel-arm
--#OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
--#Build-host-os: ubuntu-64
--#Description: Tizen ARM Emulator Kernel