Merge "Fix variable shadowing." into tizen
authorMichal Bloch <m.bloch@samsung.com>
Thu, 8 Feb 2018 10:55:09 +0000 (10:55 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 8 Feb 2018 10:55:09 +0000 (10:55 +0000)

Trivial merge