tree 2ac799619efe6120bbffe2e34707883c26ce4574
parent 6ffd4e7d4872cdcbabc89b861bfddc3c86b26fea
author Harry Terkelsen <het@google.com> 1424384693 -0800
committer Harry Terkelsen <het@google.com> 1424384693 -0800

Allow fields to be named "map"

Change-Id: I41b089b1e6cc6901a28e36e756881f8c45a96356