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

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

Change-Id: I6779e7658b6f5e4d22c48c63712c0c1de1fdd138

diff --cc tizen/src/Makefile
Simple merge

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

diff --cc tizen/src/emul_state.h
index 7fbf67adddea023c6a971dd605d25d6ab998b212,9fb1a8e726d592f8f1c7232244ea84d99fc7ceb2..ac0fe4311f4f6c0234763776d51fdac794cd6c90
--- 1/tizen/src/emul_state.h
--- 2/tizen/src/emul_state.h
+++ b/tizen/src/emul_state.h
@@@ -33,9 -33,10 +33,9 @@@
  #ifndef __EMUL_STATE_H__
  #define __EMUL_STATE_H__
  
- 
  #include "display/maru_finger.h"
+ #include "config-host.h"
  
 -#define SUPPORT_LEGACY_ARGS
  #define MAX_ADDR_LEN    256
  #define MAX_PORT_LEN    256
  
@@@ -195,5 -198,12 +193,9 @@@ const char *get_vm_name(void)
  const char *get_profile_name(void);
  bool is_gpu_accel_enabled(void);
  const char *get_vm_data_path(void);
 -#ifdef SUPPORT_LEGACY_ARGS
 -void set_vm_data_path(const char *path);
 -#endif
+ #ifdef CONFIG_JAVA_UI
+ void set_skin_enabled(bool enabled);
+ bool is_skin_enabled(void);
+ #endif
  
  #endif /* __EMUL_STATE_H__ */

diff --cc tizen/src/emulator.c
index 7b5dad6a8b7b812891bad11a70926adc5ca17c94,531d95300cf86698cc1c51edabc1006259a9b5e8..0e0d6c553ce0afc1b8ef5efac9e4ecf580ae3f2d
--- 1/tizen/src/emulator.c
--- 2/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@@ -250,7 -252,15 +252,8 @@@ int legacy_emulator_main(int argc, cha
  
  static int emulator_main(int argc, char *argv[], char **envp)
  {
 -#ifdef SUPPORT_LEGACY_ARGS
 -    // for compatibilities...
 -    if (argc > 2 && !g_strcmp0("--skin-args", argv[1])) {
 -        return legacy_emulator_main(argc, argv, envp);
 -    }
 -#endif
 -
      int c = 0;
+     int qemu_arg_index = 0;
  
      _qemu_argv = g_malloc(sizeof(char*) * ARGS_LIMIT);
  #if defined(CONFIG_JAVA_UI)