From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Tue, 9 Aug 2016 06:22:06 +0000 (+0900)
Subject: Merge branch 'develop_linux_3.14' into platform_2.3.2
X-Git-Tag: TizenStudio_2.0_p2.3.2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf34e98f49eab22c5b5070f39d50cc9dff72db0b;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop_linux_3.14' into platform_2.3.2

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

bf34e98f49eab22c5b5070f39d50cc9dff72db0b
diff --cc package/pkginfo.manifest
index 31e706666c08,f453201701ee..88bc406a001d
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.23
+ Version: 3.14.24
  Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  
 -Package: 2.4-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