Learn more about cloning repositories
You have read-only access
Fix build error caused by a merge conflict. Commit 70d9664f removed 'int i' required by a4f30a50. Change-Id: I4e7e14e9e8532f753e43a57b5bba4589d58e0c32