Merge branch 'develop' into features/new_ui

Conflicts:
        package/changelog
        package/pkginfo.manifest

Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
Change-Id: I09d2c305d6e2795b6b02a681fa6fa3fb7587ba96

diff --cc package/changelog
index c9381db,e24302d..91f03e8
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,11 -1,17 +1,25 @@@
+ * 2.4.169
+ - match mouse up event with mouse down event
+ - ignore unpaired 'mouse up' event
+ == jihye kim<jihye424.kim@samsung.com> 2015-12-10
+ 
+ * 2.4.168
+ - fix wrong resolution showing in combo list.
+ == minkee Lee<minkee.lee@samsung.com> 2015-12-03
+ 
+ * 2.4.167
+ - remove worker thread from vm worker
+ - setting CPU type for custom base image
+ == minkee Lee<minkee.lee@samsung.com> 2015-12-01
+ 
 +* 2.4.166
 +- packaging for new-ui.
 +== minkee Lee<minkee.lee@samsung.com> 2015-11-27
 +
 +* 2.4.164
 +- some bug fix for basic working version of new-ui.
 +== minkee Lee<minkee.lee@samsung.com> 2015-11-12
 +
  * 2.4.163
  - enable -p option (select platform) in CLI.
  - enable display variables in vm_launch.conf for 2.3.2.

diff --cc src/org/tizen/emulator/manager/platform/Platform.java
Simple merge

diff --cc src/org/tizen/emulator/manager/ui/widgets/VMButton.java
Simple merge