| commit | 1a76d851d077e72f4407a630027f3cc2579f88e0 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Apr 04 07:00:02 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 04 07:00:02 2013 -0700 |
| tree | 064693f76eaae6d2e46e11bd8178fa4c269dc79c | |
| parent | 5aa725374346bbfa0d5dd867d2e8450044ce13f7 [diff] | |
| parent | a6b79eb9618fc1774aa18a0b365e48398f23808a [diff] |
am a6b79eb9: Merge "Prevent conflicts between local and proto variable names." * commit 'a6b79eb9618fc1774aa18a0b365e48398f23808a': Prevent conflicts between local and proto variable names.