From: Sangjin Kim <sangjin3.kim@samsung.com>
Date: Tue, 9 Jul 2013 09:03:43 +0000 (+0900)
Subject: Merge changes I1466e2f7,I16959c44 into tizen_qemu_1.5.1
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~900^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52d48a8396b58e703daa8fca25f24c92d160814a;p=sdk%2Femulator%2Fqemu.git

Merge changes I1466e2f7,I16959c44 into tizen_qemu_1.5.1

* changes:
  merge maruskin_operation.c & maruskin_keymap.c
  merge maru_virtio_touchscreen.c temporarily
---

52d48a8396b58e703daa8fca25f24c92d160814a