Merge "Modified preference label for timeout" into develop
authorkh5325.kim <kh5325.kim@samsung.com>
Tue, 26 Feb 2013 11:59:37 +0000 (20:59 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Tue, 26 Feb 2013 11:59:37 +0000 (20:59 +0900)
commit21bdb5f88039254aefd9a0d90158cc14810d82a3
treec305277c81b27bdb16b92eb2ba4687fff9ada95f
parentdab04d1d5029ffad35c296d400ba22cb883bbd5a
parent1d657eb1153c583e0e534c16e72262306a09188e
Merge "Modified preference label for timeout" into develop