Merge branch 'master' of git://172.21.111.188/emulator
authorsyeon.hwang <syeon.hwang@samsung.com>
Wed, 14 Mar 2012 11:08:27 +0000 (20:08 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Wed, 14 Mar 2012 11:08:27 +0000 (20:08 +0900)
1  2 
tizen/src/emulator.c

Simple merge