Merge changes I3460bcc2,Ie04d92a0 into tizen
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 10 Jun 2014 02:11:24 +0000 (19:11 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 10 Jun 2014 02:11:24 +0000 (19:11 -0700)
commit088b0aeb662239cdb5c3067714d6e52394311cab
tree137a11a63418e62d31396b391b1218dd9b9ce111
parentbe53eab9d08402b1f393fbd3396f18e164b0158a
parentfcbc9f95dbd0362bd1d62f43738d4a8b3c59de49
Merge changes I3460bcc2,Ie04d92a0 into tizen

* changes:
  display: modified varable name
  screenshot: modified function/varable names
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java
tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
tizen/src/skin/maruskin_server.c
tizen/src/skin/maruskin_server.h