Merge branch 'develop' into tizen_studio_1.2_p3.0

Change-Id: I7594a8a7e33a21e0c4ee42f56f7ab2dac952eb4e
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

diff --cc package/build.linux
index 9c7e5ab74218f49d679f12440eb9a3ca679e8c51,b16e111009ee1d63d67826d12f4b216c594f58e7..f63ce6317a6d5611dc5f7990c531b528a68b26fc
--- 1/package/build.linux
--- 2/package/build.linux
+++ b/package/build.linux
@@@ -27,9 -27,12 +27,12 @@@ build(
  # install
  install()
  {
-       KERNEL_DIR=$SRCDIR/package/3.0-emulator-kernel-x86.package.${TARGET_OS}/data/platforms/tizen-3.0/common/emulator/data/kernel
-       mkdir -p $KERNEL_DIR
 -      TIZEN_VERSIONS="4.0 3.0"
++      TIZEN_VERSIONS="3.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
  
-       cp ./bzImage.x86 $KERNEL_DIR/
-       cp ./bzImage.x86_64 $KERNEL_DIR/
+               cp ./bzImage.x86 $KERNEL_DIR/
+               cp ./bzImage.x86_64 $KERNEL_DIR/
+       done
  }

diff --cc package/pkginfo.manifest
index f38e220b321b47aad711bcbc884c017cf36361fa,44ae74b545559ce9c639b80cf4ae6448f1661235..28e626e65f979268f18dd197596caa034c38801e
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,7 -1,17 +1,7 @@@
  Source: emulator-kernel
- Version: 4.4.35.0
+ Version: 4.4.35.2
  Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  
 -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