From: Jinhyung Jo <jinhyung.jo@samsung.com>
Date: Tue, 18 Oct 2016 08:00:08 +0000 (+0900)
Subject: Merge branch 'develop_linux_3.14' into platform_2.3.2
X-Git-Tag: TizenStudio_2.0_p2.3.2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c84adea1024187b4a9f879c35110aa0b78e821df;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop_linux_3.14' into platform_2.3.2

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

c84adea1024187b4a9f879c35110aa0b78e821df
diff --cc package/pkginfo.manifest
index 88bc406a001d,0571da8990e0..a23726735856
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.24
+ Version: 3.14.25
  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