From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Thu, 16 Jun 2016 08:18:49 +0000 (+0900)
Subject: Merge branch 'develop_linux_3.14' into tizen_2.3.2
X-Git-Tag: TizenStudio_2.0_p2.3.2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3abb2918a8e9ffa3bcef7687156305d22c095eb7;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop_linux_3.14' into tizen_2.3.2

Change-Id: Ic89e13c9525f7703de18c70ce9bc207963b85d40
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---

3abb2918a8e9ffa3bcef7687156305d22c095eb7
diff --cc package/pkginfo.manifest
index 11389e81f3f0,048735be901a..e3edeb1237f8
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.18
+ Version: 3.14.19
  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