Merge branch 'develop' of newgit:sdk/emulator/emulator-kernel into develop

Conflicts:
	package/pkginfo.manifest

diff --cc package/pkginfo.manifest
index 278f141cd2d43f52eb634f24b98eb88731031e6d,e457876b5b9a983b03405e194a3686700713fa86..315ceeeffcdae751e918f69960f6d0b0cc159a7e
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,5 -1,5 +1,9 @@@
  Package: emulator-kernel
++<<<<<<< HEAD
 +Version: 1.1.3
++=======
+ Version: 1.1.2
++>>>>>>> 948357da2b9653867fcb8bc18a482fa95d5a577c
  OS: linux
  Build-host-os: linux
  Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>
@@@ -7,7 -7,7 +11,11 @@@ Source: emulator-kerne
  Description: Tizen Emulator Kernel
  
  Package: emulator-kernel
++<<<<<<< HEAD
 +Version: 1.1.3
++=======
+ Version: 1.1.2
++>>>>>>> 948357da2b9653867fcb8bc18a482fa95d5a577c
  OS: windows
  Build-host-os: linux
  Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>