Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

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

Change-Id: I2bf2ad9d2bf8a91644bf4ac35d84436d372e51b5

diff --cc package/build.macos-64
Simple merge

diff --cc package/build.ubuntu-32
Simple merge

diff --cc package/build.ubuntu-64
Simple merge

diff --cc package/build.windows-32
Simple merge

diff --cc tizen/emulator_configure.sh
Simple merge

diff --cc tizen/src/Makefile
index 7827a7587932efb2650c9fbc45081cbdb9d79301,5211a937512d6f8b84996b84a7c82b09f72a089b..3349ad6a53503c76467aa3b2b6bb0f464acfa167
--- 1/tizen/src/Makefile
--- 2/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@@ -269,9 -267,9 +269,10 @@@ ifdef CONFIG_USE_SH
  else
        TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=false ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
  endif
+ endif
  
  install_dibs: all_dibs
 +# we care about only x86_64 in DIBS now
        mkdir -p $(DIBS_COMMON_DIR)/bin
        mkdir -p $(DIBS_COMMON_DIR)/etc
        mkdir -p $(DIBS_COMMON_DIR)/icons

diff --cc tizen/src/emul_state.c
Simple merge

diff --cc tizen/src/emulator.c
Simple merge