tree c18826677ec445b248f6f3437d1a787b7c56d9e7
parent d28930acd319bbaad1159cb9761a815d7a12b089
parent 0be95fb8dcfa47a97af57e411ccf6409cd4e7534
author Christoffer Quist Adamsen <christofferqa@google.com> 1530880166 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1530880166 +0000

Merge "Handle field collisions in class merger"