tree 064693f76eaae6d2e46e11bd8178fa4c269dc79c
parent 43325653beb4e5b6923d0380a84bf7e204be5c22
author Ulas Kirazci <ulas@google.com> 1365028573 -0700
committer Wink Saville <wink@google.com> 1365080183 -0700

Prevent conflicts between local and proto variable names.

Prefix access to proto variable names with "this.". Also remove unused
GenerateMergingCode.

Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17