Merge branch 'master' of git://172.21.111.188/emulator
authorsyeon.hwang <syeon.hwang@samsung.com>
Thu, 8 Mar 2012 08:50:54 +0000 (17:50 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Thu, 8 Mar 2012 08:50:54 +0000 (17:50 +0900)
commitf0001dd9409c8c243f505ad561599ccce0f364a6
tree24f9f6e8d1ca98739b9c49220f4600579da86363
parent3c7db0f6bf375a7533909cea103c519af875d234
parent1f659d2b5ce86963e77feafb2e6e02f32ce022af
Merge branch 'master' of git://172.21.111.188/emulator

Conflicts:
tizen/src/emulator.c
tizen/src/emulator.c