Merge "merged with latest setting code"
authorSan Cho <san.cho@samsung.com>
Mon, 4 Mar 2013 06:00:48 +0000 (15:00 +0900)
committerGerrit Code Review <gerrit2@kim11>
Mon, 4 Mar 2013 06:00:48 +0000 (15:00 +0900)
commit98b652e8e1f4d0f9e95eaafa53c286e5ca5ca980
tree3169bcbf446bdfc751ab2799dd3477ba33d9366c
parent3df90a8edb6b396093616f00f666604eb0a0b0cb
parent2eafef8ac972125d6d6ebf932e683f5bdd7c102c
Merge "merged with latest setting code"