Merge "Fix variable shadowing" into tizen
authorKrzysztof Opasiak <k.opasiak@samsung.com>
Tue, 26 Sep 2017 03:16:01 +0000 (03:16 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 26 Sep 2017 03:16:01 +0000 (03:16 +0000)

Trivial merge