Merge "[Title]remove CONFIG_MARU [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem...
authormunkyu.im <munkyu.im@samsung.com>
Sun, 18 Mar 2012 16:14:23 +0000 (01:14 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Sun, 18 Mar 2012 16:14:23 +0000 (01:14 +0900)

Trivial merge