Merge "Fix conflict"
authorgs86.lee <gs86.lee@samsung.com>
Tue, 19 Jan 2016 10:19:44 +0000 (02:19 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 19 Jan 2016 10:19:44 +0000 (02:19 -0800)
commitb30e57b54c0550819e48a0240fc80ff8508b6890
tree65430489dce8fb9f7edbb76a5d1472547d3fb498
parentf66b2387f47da6c2bb58ec8d65b5b03b55618ca1
parent7c985b212302e0cf9b986a562d12c44f5f39c678
Merge "Fix conflict"