Merge changes I3460bcc2,Ie04d92a0 into tizen

* changes:
  display: modified varable name
  screenshot: modified function/varable names

diff --cc tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
Simple merge

diff --cc tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java
Simple merge

diff --cc tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
Simple merge

diff --cc tizen/src/skin/maruskin_server.c
Simple merge

diff --cc tizen/src/skin/maruskin_server.h
index 3430fcdc7fac29d179a0d28f4110c5bc5cba232d,17aafd4866a0224d69e95ad0c87cd887d8a15d24..54a4cf723fe71efba73f491b45699b230f32f062
--- 1/tizen/src/skin/maruskin_server.h
--- 2/tizen/src/skin/maruskin_server.h
+++ b/tizen/src/skin/maruskin_server.h
@@@ -35,10 -35,12 +35,10 @@@ void shutdown_skin_server(void)
  
  void notify_draw_frame(void);
  void notify_draw_blank_guide(void);
 -void notify_ecs_server_start(void);
  void notify_sdb_daemon_start(void);
 -void notify_sensor_daemon_start(void);
  void notify_ramdump_completed(void);
  void notify_booting_progress(unsigned int layer, int progress_value);
- void notify_brightness_state(bool on);
+ void notify_display_power(bool on);
  void notify_host_kbd_state(bool on);
  void notify_multi_touch_state(bool on);
  void notify_emul_reset(void);