Merge "emulator: some error reporting routine is refactored" into tizen

diff --cc tizen/src/emulator.c
index 3c269f5,2243b3e..d02d065
--- 1/tizen/src/emulator.c
--- 2/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@@ -38,8 -38,9 +38,8 @@@
  #include "emulator.h"
  #include "emul_state.h"
  #include "emulator_options.h"
 -#include "util/sdb_noti_server.h"
  #include "util/check_gl.h"
- #include "maru_err_table.h"
+ #include "util/maru_err_table.h"
  #include "util/osutil.h"
  #include "util/sdb.h"
  #include "skin/maruskin_server.h"

diff --cc tizen/src/util/Makefile.objs
Simple merge