Merge changes I1466e2f7,I16959c44 into tizen_qemu_1.5.1
authorSangjin Kim <sangjin3.kim@samsung.com>
Tue, 9 Jul 2013 09:03:43 +0000 (18:03 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Tue, 9 Jul 2013 09:03:43 +0000 (18:03 +0900)
commit52d48a8396b58e703daa8fca25f24c92d160814a
treefae1c6a8dfd12c1bd2328d50619d5e0638fa407d
parentec6971e3e6cc1541644434c24126032dca971189
parent7aeef0e92432e82987caf35024b76290eb9d5711
Merge changes I1466e2f7,I16959c44 into tizen_qemu_1.5.1

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