From: Sooyoung Ha <yoosah.ha@samsung.com>
Date: Mon, 20 Jun 2016 03:45:08 +0000 (+0900)
Subject: Merge branch 'develop_linux_3.14' into tizen_2.3.2
X-Git-Tag: TizenStudio_2.0_p2.3.2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a36e0dcb2092ed791eade98af35a4bd5f83ac5aa;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop_linux_3.14' into tizen_2.3.2

Change-ID: I5590119d18b8db15bab8dc5282fb603daf6ee908
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
---

a36e0dcb2092ed791eade98af35a4bd5f83ac5aa
diff --cc package/pkginfo.manifest
index e3edeb1237f8,f0e66ccfd94a..677a89bf4ea0
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.19
+ Version: 3.14.20
  Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  
 -Package: 3.0-emulator-kernel-x86
 +Package: 2.3.2-emulator-kernel-x86
  OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
  Build-host-os: ubuntu-64
  Description: Tizen x86 Emulator Kernel