Merge branch 'develop' into features/new_ui
authorjihye424.kim <jihye424.kim@samsung.com>
Thu, 1 Oct 2015 06:07:33 +0000 (15:07 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Thu, 1 Oct 2015 06:08:17 +0000 (15:08 +0900)
commit26389afa944bb6745102d92b28a2ef9c33ad0373
tree4688f53696eb6c381d78d4e307e851403ffb3333
parent64ef6527ea1b52ea921290ab242dccb85dd6e4b8
parent4285ba00cbf7dbe6cc0157bd111da56beee0bf5d
Merge branch 'develop' into features/new_ui

Change-Id: I05f178eedbd6c9a6272b88e161cd2b38824506df
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
.classpath
build.xml
src/org/tizen/emulator/manager/platform/Profile.java
src/org/tizen/emulator/manager/resources/FilePathResources.java
src/org/tizen/emulator/manager/vms/VMWorkerCommon.java