tree 4ef6e127b12bbc6a437c078a8012b5380a091d2c
parent 785d0fa2e55fe8258730353d40cfc51beed25e79
parent 1cbc764c493259346312829318a554c7cb112d5b
author Christoffer Quist Adamsen <christofferqa@google.com> 1529999512 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1529999512 +0000

Merge "Unique names in case of class merging conflicts"