Merge "[Title] added CONFIG_MARU define [Type] [Module] Emulator [Priority] major...
authoryeongkyoon lee <yeongkyoon.lee@samsung.com>
Thu, 26 Jul 2012 07:45:12 +0000 (16:45 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Thu, 26 Jul 2012 07:45:12 +0000 (16:45 +0900)

Trivial merge