Merge "sdb: change sdb path and source address" into tizen_2.3_develop

touch: set maximum count value of multitouch point at device

Change-Id: I0070cde93cc88093ba191a9ffcca415a1965ab28
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

sdb: change sdb path and source address

Change-Id: I5534077676a363531d5cbd7adf099b5a858f47d2
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

sdb: changed adding port index from sdb to ecs (+1 -> +3)

Change-Id: I3ab599c806eab5e477e813f36d9b5b5f1b2f2cb5
Signed-off-by: jinhyung.jo <jinhyung.jo@samsung.com>
(cherry picked from commit 475803716dc0390e2debb1cb76077055fb9134d7)

evdi: added "profile" option

Change-Id: I7f06a4143f28056288b57e91b69ecba9eeaac364
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

emulator: detecting some error cases

Detecting some error cases in profile conf file.
Quotes can be used in default value section from now.

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

build: add include path for jni_md.h

Change-Id: I96bdb0da2a3561f95d8bf68d688b369c6300784d
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

emulator_options: introduced recursive variable substitution

Users can write variable position-independently.

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

ecs: change tizen-sdk-data path

It was changed by restructuring directories job.

Change-Id: Idc8281dfdea892de214acad034d3146d9f53031b
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

board: remove unused variables

Change-Id: I65b217e2c3a54750d8bb25cf17af3df9869049a1
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

maru_shm: consider unsigned short

Change-Id: Ic4d64833a9ca1c57a59136d23fd3de4e97f4f618
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

build: fix compilation warnings produced by recent clang

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
tizen/src/skin/maruskin_client.c

Change-Id: Ic3ac6a1cf6574f0e8930fd70f7809e5e36d1309c

target-i386/translate.c: Remove unused tcg_gen_lshift()

The function tcg_gen_lshift() is unused; remove it.

Change-Id: Ie3669b492812ea84cf847c9120a35a4833217080
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

hw/i386/pc.c: Remove unused parallel_io and parallel_irq variables

The variables parallel_io and parallel_irq are unused; delete them.

Change-Id: Ie237ca77d148710807bb8b97b887cafe3457b162
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

hw/net/ne2000-isa: Register vmstate struct

The ne2000-isa device defines a VMState struct for migration, but
we forgot to actually register it. Correct this deficiency by
setting dc->vmsd.

Change-Id: If637bfc5923df0ae28a89fde16475a87f57b320b
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

9pfs: fix compilation errors on Mac OS X.

in case of Mac OS X, mode_t type is unsigned short.
So, -1 cannot be compared to mode_t type.

Change-Id: Iad1e4a1049e14de0575ed6da11b339ed9045b12d
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

hw/net/eepro100: Implement read-only bits in MDI registers

Although we defined an eepro100_mdi_mask[] array indicating which bits
in the registers are read-only, we weren't actually doing anything with
it. Make the MDI register-write code use it rather than manually making
register 1 read-only and leaving the rest as reads-as-written. (The
special-case handling of register 0 remains as before since its mask is
all-zeros and the special casing happens before we apply the masking.)

Change-Id: I1fe9363069f178f09f587f401dc15e02751db5d1
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1402159924-13853-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

slirp: Remove unused zero_ethaddr[] variable

The zero_ethaddr[] array is never used; delete it.

Change-Id: Ia78b5a2acee9d7660b5f74cb82b57b433ce803fb
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

block/vhdx.c: Mark parent_vhdx_guid variable as unused

The parent_vhdx_guid variable is defined but never used, which provokes
complaints from newer versions of clang. Since the variable definition
is here acting as documentation of the image format, mark it with the
'unused' attribute to keep the compiler happy rather than simply
deleting it.

Change-Id: I58583bcf96fec879068eade50de86c1e2249ea93
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

build: fix the build fail by W/A

emul_state has modified but not all changes merged.
so block some codes for build.

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

emulator: print args information immediately

Change-Id: Ie468bb749405fcca606c559eb2d65615003f46c6
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
(cherry picked from commit edff86ef3c63900dfa9ecc111b6b4135026f592d)
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

emulator: removed "--profile" argument

Removed "--profile" argument. It is not necessary anymore.

Change-Id: Ie0f93d44b4548c325bf5a87b44a0f9759164538a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
(cherry picked from commit 92b19938f596a08107ddc2f00b3188958052bae7)
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

scripts: modified launch script

Modified launch script for Mac.
Added remote/lib to library path under Linux.
All environment variables set by script.
Added "--with-gdb" features in batch file.
Installed emulator.sh on Windows for mingw users.

Change-Id: Ida332ccc2c6ffc448b83ca73b4adf9c650b86153
(cherry picked from commit ac1ffe7ddb195b5950eef74f181aacbc82f86a15)
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

raw-win32.c: fixed compilation error

Fixed compilation error when CONFIG_MARU was not given.

Change-Id: Ibf19aec67098ca6754e4f42e47645e543ddb60f5
(cherry picked from commit 3604b9a9d8c8896ce7a456078258d92c44e90d8c)
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

emulator: rename section "DEFAULT_VALUE" to "VARIABLES"

Change-Id: Ib6e86086718f6ac6d64204dda7137c6c6901340d
(cherry picked from commit 87160f6038ef31ec2a060a48eb9ee75163cd62bf)
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

emulator: fixed bugs in get_drive_image_file()

Change-Id: I3b7169785499086c32ff9588acfb26a921f180f2
(cherry picked from commit 77a44857588e0ad46287ae30e1226bb1714b0d8a)
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

emulator: used "drive_image_file" instead of "tizen_target_img_path"

Change-Id: I6db0655f1c6b5c84a4360801d920809a7931cfb4
(cherry picked from commit e85a2024d6bbb29c06e986c2e6300a03f929e03a)
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

emulator: introduced "image_file_path"

It is an advanced alternative to "target_target_img_path".

Change-Id: Iec530c63ffc13c4fc0fc2fd32a7df2f64d4e9e8b
(cherry picked from commit dc990fd000f60f85bd99c75d0d5ba29587d2d56f)
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

emulator: removed W/A for SDL windows

libSDL should compiled with "--disable-stdio-redirect".

Change-Id: Ia614a26ec3d32afb432f404076f74a16246f422b
(cherry picked from commit c545582b9b2aa26dac39a2a4b0aa83f81e003b57)
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

util/qemu-sockets.c: Avoid unused variable warnings

The 'on' variable is never used, and 'off' is only used
if IPV6_V6ONLY is defined; delete 'on' and move 'off' to
the point where it is used. This avoids warnings from
clang 3.4.

Change-Id: Ia886bd9b95c0b019d5808834cf704bc97a3cd312
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

Build: Modified build script.

Change-Id: Ia212f4f83c062c6360835d9f0ed63e50cf6edd38
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

brillcodec: support h.264 encoder

configure and use libx264 to support h.264 encoder

Change-Id: I17245ca51b1447dcd8470f2d2b56484ad7fc37db
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
(cherry picked from commit c3d9a0018cc87adf4a0e1e472da472b2eaa6980c)
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

package: modify package name, restructure directories

Change-Id: I290517ef261b436881c4dd59fa18e06707779558
Signed-off-by: chulhosong.song <chulhosong.song@samsung.com>

package: removed build/install dependency for spice server

Change-Id: Ie460adee051ba93316161b3666b578fc349aef4d
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

package: version up

2.1.10

Change-Id: I8fcfc85339d4e1cb3834c2472175e8e8836bbe87
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

menu: disable Host Keyboard menu on qHD skin

Change-Id: I7f8a90913469c55de3c19680a4ad8e366e665a75
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

skin: added null check

Change-Id: I906a0077203e3a54bafefbd9a64059528f89be89
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

package: version up

2.1.9

Change-Id: I85c08b87d9296627a14954830566f4e14211cec3
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

skin: qHD skin packaging

Change-Id: If04a2a4b412d42554fe8fa2997073421f925dd3c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

build: package version up (2.1.8)

Change-Id: I1a5bbe137f73bd01952eac3c8525e231f12cdd8e
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

Merge "ecs: bug fixed for ecs_mon message" into tizen_2.3

ecs: bug fixed for ecs_mon message

Change-Id: I6d7d8d03003e19a1c54efb342a8009466d60f448
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

Merge "sdcard: Fix failing re-attaching on Windows" into tizen_2.3

sdcard: Fix failing re-attaching on Windows

It's failed when try to attach > detach > attach on Windows.
It's becuase of failing unlock when detach sdcard image.

Change-Id: I5c4451e6581480e43125e2be5a71fdebbc92f94c
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

Merge "build: package version up (2.0.38)" into tizen_2.3

build: package version up (2.0.38)

Change-Id: I553728bf176c287026f2216de24068986fd7471d
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

hds: isolated hds path & attached state in emul_state

Change-Id: I0c681dce5a53d9708198d2b760e8560d46c59a07
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

Merge changes I672ef37d,Ie7369b2b into tizen_2.3

* changes:
  Package: version up. (2.0.37)
  Check-gl: Modified install script.

Merge "check-gl: remove the error pop-up & exit code" into tizen_2.3

Package: version up. (2.0.37)

Change-Id: I672ef37dd036b5b734ea391fa981952497cb7557
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

Check-gl: Modified install script.

- Removed /bin/bash's '-e' option to handle the check_gl return value.
  Install script with '-e' option terminates when check_gl return non-zero
  and rest of script become a dead code.

Change-Id: Ie7369b2b792bdd1459ae9c9102216f9f4cd20d20
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

check-gl: remove the error pop-up & exit code

Remove error routine when the GL driver is Gallium.

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

eventcast: fix an infinite loop of notifier routine.

Whenever a client connects to a server, notifier function is registered to notifier_list repeatedly.
It makes emulator become infinite loop state when emulator is terminated.

Change-Id: Ib7c92c03bb659290df5434c17822db08b2fa60a8
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

menu: add null checking

Change-Id: If600835393ed1cca5815bff2c9b77fdc853f84f5
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

bug fixed: added ifdef for unused sdcard_info structure in Windows

Change-Id: Iae23af6ac676c70cffa840643f16585bf264b5af
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

Merge "bug fixed: variable initialization" into tizen_2.3

bug fixed: variable initialization

Change-Id: I03d305e898826dfd9774809f7bd9ea78b89333b7
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

build: package version up (2.0.36)

Change-Id: Ib7ec397a0a0e94de49c78ebbcb11e7c30f1f6dad
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

Merge "sensor: added pressure, ultraviolet, and hrm sensor devices" into tizen_2.3

sensor: added pressure, ultraviolet, and hrm sensor devices

- new log format is applied.

Change-Id: I5009031a8d3de8d8a51cc1c9cc2e2fe7ac47e5ae
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

Check-GL: Added check-gl pop-up when install SDK in Ubuntu.

Change-Id: Ic79803a622d397ad52ce79fcce0aff1afe8b63cb
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

check-gl: Modified check-gl

Add the routine to check GL driver vendor on Ubuntu

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

Merge "sdcard: Arrange source codes" into tizen_2.3

sdcard: Arrange source codes

 - handle filelock fd/handle
 - add removed codes by merging tizen branch

Change-Id: Ic3f0c41cdb490eee81c28acd8fd65a56b416117a
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

menu: add null checking

Change-Id: Ie775be73ace5a5270745c43384c746c49d767b19
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

emulator_option: fix resource leak.

it did not close file handle when returning value.

Change-Id: I6d0defdfa8ca1fb5e477f5b8b1f44ad82124ba5b
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

package: version up

Change-Id: I5b56098bdcab1eb95fdeab7b634efe07e668ac4c
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

Merge "ecs: Size up location data buffer" into tizen_2.3

ecs: Size up location data buffer

Change-Id: I35d5a1d6673daadaf29224f9c46bcbf890fb056d
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

Merge "package: version up" into tizen_2.3

Merge "brillcodec: initialized AVPacket variable." into tizen_2.3

package: version up

2.0.34

Change-Id: I2b99f29c1c252e877c542e216d1b2df830bc5dfa
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

VIGS & YaGL: Fixed the incorrect condition

Fix a wrong variable name, dobj -> wqobj.

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

Revert "sdb: fix sdbd port to a dynamic number"

Change-Id: I33a18317f22ba804b977ebae198c27fef75bdfc3
Signed-off-by: shingil.kang <shingil.kang@samsung.com>

brillcodec: initialized AVPacket variable.

there is a case when AVPacket variable can be used without initialization.

Change-Id: I973cb1f39ae2c7c5fc40cefe99751587a33373d5
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

new_debug_ch: Extended length of channel name

Extend length to name field of channel structure to prevent an incorrect reference.
Even if a channel name is max length(15), it is always null terminated.

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

configure: remove --disable-coroutine-pool on Windows

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

coroutine-win32.c: Add noinline attribute to work around gcc bug

A gcc codegen bug in x86_64-w64-mingw32-gcc (GCC) 4.6.3 means that
non-debug builds of QEMU for Windows tend to assert when using
coroutines. Work around this by marking qemu_coroutine_switch
as noinline.

If we allow gcc to inline qemu_coroutine_switch into
coroutine_trampoline, then it hoists the code to get the
address of the TLS variable "current" out of the while() loop.
This is an invalid transformation because the SwitchToFiber()
call may be called when running thread A but return in thread B,
and so we might be in a different thread context each time
round the loop. This can happen quite often.  Typically.
a coroutine is started when a VCPU thread does bdrv_aio_readv:

     VCPU thread

     main VCPU thread coroutine      I/O coroutine
        bdrv_aio_readv ----->
                                     start I/O operation
                                       thread_pool_submit_co
                       <------------ yields
        back to emulation

Then I/O finishes and the thread-pool.c event notifier triggers in
the I/O thread.  event_notifier_ready calls thread_pool_co_cb, and
the I/O coroutine now restarts *in another thread*:

     iothread

     main iothread coroutine         I/O coroutine (formerly in VCPU thread)
        event_notifier_ready
          thread_pool_co_cb ----->   current = I/O coroutine;
                                     call AIO callback

But on Win32, because of the bug, the "current" being set here the
current coroutine of the VCPU thread, not the iothread.

noinline is a good-enough workaround, and quite unlikely to break in
the future.

(Thanks to Paolo Bonzini for assistance in diagnosing the problem
and providing the detailed example/ascii art quoted above.)

Change-Id: I4a5f4960be4691f6e5d5ad7de7731e14ab594312
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1403535303-14939-1-git-send-email-peter.maydell@linaro.org
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>

Merge "brillcodec: source clean-up" into tizen_2.3

Merge "brillcodec: use parser APIs to fix broken images in case of mpegts." into tizen_2.3

Merge "brillcodec: clean-up source" into tizen_2.3

Merge "brillcodec: remove redundant memory copy when decoding video" into tizen_2.3

brillcodec: source clean-up

remove duplicated sources when resampling audio buffer.

Change-Id: I31aed8e705c3eb7fa76b67c247efbe2d733abf4e
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

brillcodec: use parser APIs to fix broken images in case of mpegts.

Some decoders are required to use parsers, especially mpeg2video
and parser APIs help them to fix broken frame issue.

Change-Id: I48d413bbd57fafd52db3e810313f308ced3d89e8
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

brillcodec: clean-up source

brillcodec is separated into two source files.
Using macro to get a proper codec context.

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

brillcodec: remove redundant memory copy when decoding video

This patch improve performance when playing HD+ video.
Remove maru_brill_codec_get_picture_size() function. We use avpicture_get_size() and avpicture_fill() instead.

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

maru_err_table: prevent double free case.

Duplicate source path to avoid double free case
becuase the path might be released at caller side.

Change-Id: I3a3b2a3605c4c4fbca13c6496c898a0f8e268348
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

eventcast: add evencast_ define

add those macros to avoid redundant declarations

Change-Id: I524d94abacfcb7ab191f2707d07321d460a9a60e
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

Merge "eventcast: fix build error on Mac OS X." into tizen_2.3

eventcast: fix build error on Mac OS X.

CONFIG_SHM is not defined. It causes duplicated symbol declaration.

Change-Id: I4bbd1b8f9d609526f071ea71fd1a47752ee6c7de
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

osutil: fix compilation error on Windows

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

Merge changes I4dde16ab,Ibae6431f into tizen_2.3

* changes:
  hw: remove duplicate source and header
  build: package version up (2.0.33)

Merge "hds: bug fixed - device hotplug checking routine" into tizen_2.3

Merge "keyboard: deleted conditional codes to check host keyboard state" into tizen_2.3

hds: bug fixed - device hotplug checking routine

Change-Id: Ica280016b1b41ccac0b5ef80d4f1f84db557cb6d
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

brillcodec: revert this module until resolving plugin probe issue.

Change-Id: Ib7e20ece682c931ba0ac3944b673d0747e1b00fd
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

hw: remove duplicate source and header

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

build: package version up (2.0.33)

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

keyboard: deleted conditional codes to check host keyboard state

Change-Id: Ica22d3b7bb6ee37b11596ac318d0e004592c67f6
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

Merge branch 'tizen' into tizen_2.3

Conflicts:
tizen/src/util/osutil.c

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